diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeDesignByCustomerResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeDesignByCustomerResultDTO.java index 2ccebf420c..64dbfdaa26 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeDesignByCustomerResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeDesignByCustomerResultDTO.java @@ -17,11 +17,11 @@ public class HomeDesignByCustomerResultDTO implements Serializable { /** * 标题区 */ - private CommonComponentDesignResultDTO titleList; + private List titleList; /** * 置顶区 */ - private CommonComponentDesignResultDTO topList; + private List topList; /** * 功能区 */ @@ -29,7 +29,7 @@ public class HomeDesignByCustomerResultDTO implements Serializable { /** * 悬浮区 */ - private CommonComponentDesignResultDTO floatingList; + private List floatingList; /** *用于标识已使用的功能组件id列表(不含通用组件) */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java index b0edee660e..9d936c031e 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java @@ -48,22 +48,28 @@ public class HomeServiceImpl implements HomeService { HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO(); //根据客户id,所属端获取客户首页配置的设计稿 List list = customerHomeDetailDao.getCustomerHomeDetailComponent(formDTO); - List flist=new ArrayList();//功能组件列表 + List titlelist=new ArrayList(); + List toplist=new ArrayList(); + List functionlist=new ArrayList(); + List floatlist=new ArrayList(); List usedComponent=new ArrayList<>();//使用过的组件集合 for(CommonComponentDesignResultDTO c:list){ usedComponent.add(c.getComponentId()); //所属区域:0.标题区、1.置顶区、2.功能区、3.悬浮区 if(ReginConstant.titleList.equals(c.getRegion())){ - resultDTO.setTitleList(c); + titlelist.add(c); }else if(ReginConstant.topList.equals(c.getRegion())){ - resultDTO.setTopList(c); + toplist.add(c); }else if(ReginConstant.functionList.equals(c.getRegion())){ - flist.add(c); + functionlist.add(c); }else if(ReginConstant.floatingList.equals(c.getRegion())){ - resultDTO.setFloatingList(c); + floatlist.add(c); } } - resultDTO.setFunctionList(flist); + resultDTO.setTitleList(titlelist); + resultDTO.setTopList(toplist); + resultDTO.setFloatingList(floatlist); + resultDTO.setFunctionList(functionlist); resultDTO.setUsedComponentIdList(usedComponent); return new Result().ok(resultDTO); }