Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide

# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java

@@ -49,11 +49,6 @@ public interface ServiceConstant {
      */
     String RESI_GUIDE_SERVER = "resi-guide-server";
 
-    /**
-     * 政府机构组织管理
-     */
-    String GOV_ORG_SERVER = "gov-org-server";
-
     /**
      * 政府端组织架构
      */

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDetailDTO.java

@@ -49,9 +49,9 @@ public class CustomerHomeDetailDTO implements Serializable {
 	private String componentId;
 
     /**
-     * 所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
+     * 所属区域：titleList.标题区、topList.置顶区、functionList.功能区、floatingList.悬浮区
      */
-	private Integer region;
+	private String region;
 
     /**
      * 高级配置

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeTemplateDTO.java

@@ -49,9 +49,9 @@ public class CustomerHomeTemplateDTO implements Serializable {
 	private Integer clientType;
 
     /**
-     * 所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
+     * 所属区域：titleList.标题区、topList.置顶区、functionList.功能区、floatingList.悬浮区
      */
-	private Integer region;
+	private String region;
 
     /**
      * 高级配置 JSON串

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/HomeComponentDTO.java

@@ -64,9 +64,9 @@ public class HomeComponentDTO implements Serializable {
 	private Integer conponentType;
 
     /**
-     * 所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
+     * 所属区域：titleList.标题区、topList.置顶区、functionList.功能区、floatingList.悬浮区
      */
-	private Integer region;
+	private String region;
 
     /**
      * 高级配置

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/HomeComponentFormDTO.java

@@ -20,9 +20,9 @@ public class HomeComponentFormDTO implements Serializable {
 	private String componentId;
 
 	/**
-	 * 所属区域
+	 * 所属区域：titleList.标题区、topList.置顶区、functionList.功能区、floatingList.悬浮区
 	 */
-	private Integer region;
+	private String region;
 
 	/**
 	 * 高级配置项

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CommonComponentResultDTO.java

@@ -42,4 +42,9 @@ public class CommonComponentResultDTO implements Serializable {
 	 * 配置项说明
 	 */
 	private String configurationDescription;
+
+	/**
+	 * 所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
+	 */
+	private String region;
 }

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<CommonComponentDesignResultDTO> titleList;
 	/**
 	 * 置顶区
 	 */
-	private CommonComponentDesignResultDTO topList;
+	private List<CommonComponentDesignResultDTO> topList;
 	/**
 	 * 功能区
 	 */
@@ -29,7 +29,7 @@ public class HomeDesignByCustomerResultDTO implements Serializable {
 	/**
 	 * 悬浮区
 	 */
-	private CommonComponentDesignResultDTO floatingList;
+	private List<CommonComponentDesignResultDTO> floatingList;
 	/**
 	 *用于标识已使用的功能组件id列表（不含通用组件）
 	 */

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ReginConstant.java

@@ -0,0 +1,19 @@
+package com.epmet.constant;
+
+/**
+ * @Classname ReginEnum
+ * @Description 所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
+ * @Date 2020/3/17 15:22
+ * @Created by yangs
+ */
+public interface ReginConstant {
+    //所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
+    //0.标题区
+    String titleList="titleList";
+    //1.置顶区
+    String topList="topList";
+    //2.功能区
+    String functionList="functionList";
+    //3.悬浮区
+    String floatingList="floatingList";
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java

@@ -43,7 +43,12 @@ public interface CustomerHomeDetailDao extends BaseDao<CustomerHomeDetailEntity>
 	 * @date 2020/3/16 14:02
 	 */
 	void updateCustomerHomeDetailByHomeId(String homeId);
-
+	/**
+	 *
+	 * 根据客户id,所属端获取客户首页配置的设计稿
+	 * @author yangshaoping
+	 * @date 2020/3/1714:02
+	 */
     List<CommonComponentDesignResultDTO> getCustomerHomeDetailComponent(HomeDesignByCustomerFormDTO form);
 
     List<CommonComponentDesignResultDTO> getHomeReleaseByCustomer(CustomerHomeFormDTO form);

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeDetailEntity.java

@@ -49,9 +49,9 @@ public class CustomerHomeDetailEntity extends BaseEpmetEntity {
 	private String componentId;
 
     /**
-     * 所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
+     * 所属区域：titleList.标题区、topList.置顶区、functionList.功能区、floatingList.悬浮区
      */
-	private Integer region;
+	private String region;
 
     /**
      * 高级配置

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeTemplateEntity.java

@@ -49,9 +49,9 @@ public class CustomerHomeTemplateEntity extends BaseEpmetEntity {
 	private Integer clientType;
 
     /**
-     * 所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
+     * 所属区域：titleList.标题区、topList.置顶区、functionList.功能区、floatingList.悬浮区
      */
-	private Integer region;
+	private String region;
 
     /**
      * 高级配置 JSON串

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/HomeComponentEntity.java

@@ -64,9 +64,9 @@ public class HomeComponentEntity extends BaseEpmetEntity {
 	private Integer conponentType;
 
     /**
-     * 所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
+     * 所属区域：titleList.标题区、topList.置顶区、functionList.功能区、floatingList.悬浮区
      */
-	private Integer region;
+	private String region;
 
     /**
      * 高级配置

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.ReginConstant;
 import com.epmet.dao.CustomerHomeDao;
 import com.epmet.dao.CustomerHomeDetailDao;
 import com.epmet.dao.HomeComponentDao;
@@ -42,23 +43,30 @@ public class HomeServiceImpl implements HomeService {
     @Override
     public Result<HomeDesignByCustomerResultDTO> getHomeDesignByCustomer(HomeDesignByCustomerFormDTO formDTO) {
         HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO();
+        //根据客户id,所属端获取客户首页配置的设计稿
         List<CommonComponentDesignResultDTO> list = customerHomeDetailDao.getCustomerHomeDetailComponent(formDTO);
-        List<CommonComponentDesignResultDTO> flist=new ArrayList<CommonComponentDesignResultDTO>();//功能组件
+        List<CommonComponentDesignResultDTO> titlelist=new ArrayList<CommonComponentDesignResultDTO>();
-        List<String> usedComponent=new ArrayList<>();//使用的组件集合
+        List<CommonComponentDesignResultDTO> toplist=new ArrayList<CommonComponentDesignResultDTO>();
+        List<CommonComponentDesignResultDTO> functionlist=new ArrayList<CommonComponentDesignResultDTO>();
+        List<CommonComponentDesignResultDTO> floatlist=new ArrayList<CommonComponentDesignResultDTO>();
+        List<String> usedComponent=new ArrayList<>();//使用过的组件集合
         for(CommonComponentDesignResultDTO c:list){
             usedComponent.add(c.getComponentId());
             //所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
-            if("0".equals(c.getRegion())){
+            if(ReginConstant.titleList.equals(c.getRegion())){
-                resultDTO.setTitleList(c);
+                titlelist.add(c);
-            }else if("1".equals(c.getRegion())){
+            }else if(ReginConstant.topList.equals(c.getRegion())){
-                resultDTO.setTopList(c);
+                toplist.add(c);
-            }else if("2".equals(c.getRegion())){
+            }else if(ReginConstant.functionList.equals(c.getRegion())){
-                flist.add(c);
+                functionlist.add(c);
-            }else if("3".equals(c.getRegion())){
+            }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<HomeDesignByCustomerResultDTO>().ok(resultDTO);
     }

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml

@@ -28,7 +28,7 @@
             AND DEL_FLAG = 0
     </update>
 
-    <!--   客户草稿列表查询 -->
+    <!--   根据客户id,所属端获取客户首页配置的设计稿 -->
     <select id="getCustomerHomeDetailComponent" parameterType="com.epmet.dto.form.HomeDesignByCustomerFormDTO"
             resultType="com.epmet.dto.result.CommonComponentDesignResultDTO">
     SELECT
@@ -41,13 +41,13 @@
     FROM
         (
             SELECT
-                *
+                a.id
             FROM
                 customer_home a
-            WHERE 1 = 1
+            WHERE
-		    AND a.DEL_FLAG = 0
+		     a.DEL_FLAG = 0
-            AND a.CUSTOMER_ID = ${customerId}
+            AND a.CUSTOMER_ID = #{customerId}
-            AND a.CLIENT_TYPE = ${clientType}
+            AND a.CLIENT_TYPE = #{clientType}
             ORDER BY
                 a.CREATED_TIME DESC
             LIMIT 1
@@ -55,7 +55,7 @@
     INNER JOIN customer_home_detail b ON a.id = b.HOME_ID
     LEFT JOIN home_component c ON b.COMPONENT_ID = c.id
     WHERE
-        a.DEL_FLAG = 0
+          b.DEL_FLAG = 0 and c.DEL_FLAG=0
     </select>
 
     <!--   客户发布列表查询 -->

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/HomeComponentDao.xml

@@ -32,7 +32,8 @@
             hc.COMPONENT_FRONT_ID,
             hc.CONFIGURATION,
             hc.DEMO_DATA,
-            hc.CONFIGURATION_DESCRIPTION
+            hc.CONFIGURATION_DESCRIPTION,
+            hc.REGION
         FROM
             home_component hc
         WHERE
@@ -85,7 +86,8 @@
         hc.COMPONENT_FRONT_ID,
         hc.CONFIGURATION,
         hc.DEMO_DATA,
-        hc.CONFIGURATION_DESCRIPTION
+        hc.CONFIGURATION_DESCRIPTION,
+        hc.REGION
         FROM
         home_component hc
         WHERE