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

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

@@ -0,0 +1,28 @@
+package com.epmet.commons.tools.constant;
+
+/**
+ * 公用参数常量
+ */
+public interface AppClientConstant {
+
+    /**
+     * app类型-居民端端
+     */
+    String APP_RESI = "resi";
+    /**
+     * app类型-政府端
+     */
+    String APP_GOV = "gov";
+    /**
+     * app类型-运营端
+     */
+    String APP_OPER = "oper";
+    /**
+     * PC端:web
+     */
+    String CLIENT_WEB = "web";
+    /**
+     * 微信小程序:wxmp
+     */
+    String CLIENT_WXMP = "wxmp";
+}

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

@@ -34,6 +34,7 @@
     SELECT
 	b.COMPONENT_ID,
 	c.COMPONENT_NAME,
+	c.COMPONENT_FRONT_ID,
 	b.REGION,
 	b.CONFIGURATION,
 	b.DEMO_DATA,

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java

@@ -106,5 +106,5 @@ public interface StrangerAccessRecordService extends BaseService<StrangerAccessR
      * @return void
      * @author sun
      */
-    Result<HomeDesignByCustomerResultDTO> getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO);
+    Result<HomeDesignByCustomerResultDTO> getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO) throws Exception;
 }

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java

@@ -2,7 +2,9 @@ package com.epmet.service.impl;
 
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -178,7 +180,7 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
      * @author sun
      */
     @Override
-    public Result<HomeDesignByCustomerResultDTO> getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO) {
+    public Result<HomeDesignByCustomerResultDTO> getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO) throws Exception {
         //token里边有所属端 userId这些参数 前台传递customerID和gridId
         //1:调用epmet-user服务查询数据 新建网格记录数据
         VisitedFormDTO vi = new VisitedFormDTO();
@@ -188,7 +190,7 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
         epmetUserFeignClient.saveLatestAndVisited(vi);
 
         //2:调用ope-customize服务 获取首页发布数据
-        Result<HomeDesignByCustomerResultDTO> res = getCustomerHomeData(formDTO.getCustomerId(),tokenDTO.getClient());
+        Result<HomeDesignByCustomerResultDTO> res = getCustomerHomeData(formDTO.getCustomerId(),tokenDTO.getApp());
         return res;
 
     }
@@ -200,10 +202,15 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
      * @return
      * @author sun
      */
-    public Result<HomeDesignByCustomerResultDTO> getCustomerHomeData(String customerId,String clientType){
+    public Result<HomeDesignByCustomerResultDTO> getCustomerHomeData(String customerId,String clientType) throws Exception {
         CustomerHomeFormDTO dto = new CustomerHomeFormDTO();
         dto.setCustomerId(customerId);
-        dto.setClientType(clientType);//居民端
+        //居民端 所以参数必须是居民端的参数 否则就是参数错误s
+        if (AppClientConstant.APP_RESI.equals(clientType)){//居民端
+            dto.setClientType(NumConstant.ZERO_STR);
+        }else {
+            throw new Exception("参数异常，app端不是指定的居民端，请检查token信息！");
+        }
         return operCustomizeFeignClient.getHomeReleaseByCustomer(dto);
     }