| 
						
						
						
					 | 
					@ -1,7 +1,7 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					package com.epmet.service.impl; | 
					 | 
					 | 
					package com.epmet.service.impl; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.Result; | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.Result; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					import com.epmet.constant.ClientTypeEnum; | 
					 | 
					 | 
					import com.epmet.constant.ReginEnum; | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dao.CustomerHomeDao; | 
					 | 
					 | 
					import com.epmet.dao.CustomerHomeDao; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dao.CustomerHomeDetailDao; | 
					 | 
					 | 
					import com.epmet.dao.CustomerHomeDetailDao; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dao.HomeComponentDao; | 
					 | 
					 | 
					import com.epmet.dao.HomeComponentDao; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -53,13 +53,13 @@ public class HomeServiceImpl implements HomeService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        for(CommonComponentDesignResultDTO c:list){ | 
					 | 
					 | 
					        for(CommonComponentDesignResultDTO c:list){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            usedComponent.add(c.getComponentId()); | 
					 | 
					 | 
					            usedComponent.add(c.getComponentId()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            //所属区域:0.标题区、1.置顶区、2.功能区、3.悬浮区
 | 
					 | 
					 | 
					            //所属区域:0.标题区、1.置顶区、2.功能区、3.悬浮区
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            if(ClientTypeEnum.title.getKey().equals(c.getRegion())){ | 
					 | 
					 | 
					            if(ReginEnum.title.getKey().equals(c.getRegion())){ | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					                resultDTO.setTitleList(c); | 
					 | 
					 | 
					                resultDTO.setTitleList(c); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            }else if(ClientTypeEnum.top.getKey().equals(c.getRegion())){ | 
					 | 
					 | 
					            }else if(ReginEnum.top.getKey().equals(c.getRegion())){ | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					                resultDTO.setTopList(c); | 
					 | 
					 | 
					                resultDTO.setTopList(c); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            }else if(ClientTypeEnum.function.getKey().equals(c.getRegion())){ | 
					 | 
					 | 
					            }else if(ReginEnum.function.getKey().equals(c.getRegion())){ | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					                flist.add(c); | 
					 | 
					 | 
					                flist.add(c); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            }else if(ClientTypeEnum.floating.getKey().equals(c.getRegion())){ | 
					 | 
					 | 
					            }else if(ReginEnum.floating.getKey().equals(c.getRegion())){ | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					                resultDTO.setFloatingList(c); | 
					 | 
					 | 
					                resultDTO.setFloatingList(c); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            } | 
					 | 
					 | 
					            } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |