Merge remote-tracking branch 'origin/dev_plugins' into dev_temp

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

@@ -0,0 +1,30 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 获取可用组件、获取小程序首页配置，入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/25 10:28
+ */
+@Data
+public class HomeTemplateCommonFormDTO implements Serializable {
+    public interface AddUserInternalGroup {}
+    /**
+     * 所属端类型 0:居民端 1:政府端
+     */
+    @NotBlank(message = "所属端类型不能为空",groups = {AddUserInternalGroup.class})
+    private String clientType;
+
+    public String getClientType() {
+        return clientType;
+    }
+
+    public void setClientType(String clientType) {
+        this.clientType = clientType;
+    }
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeTemplateController.java

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.CustomerHomeTemplateDTO;
+import com.epmet.dto.form.HomeTemplateCommonFormDTO;
 import com.epmet.dto.result.ComponentListByCustomerResultDTO;
 import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
 import com.epmet.excel.CustomerHomeTemplateExcel;
@@ -98,40 +99,26 @@ public class CustomerHomeTemplateController {
 
     /**
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ComponentListByCustomerResultDTO>
-     * @param params clientType 所属端：0.居民端，1.领导端
+     * @param formDTO clientType 所属端：0.居民端，1.领导端
      * @author yinzuomei
      * @description 获取可用组件列表
      * @Date 2020/8/24 21:15
      **/
     @PostMapping("getcomponentlist")
-    public Result<ComponentListByCustomerResultDTO> getComponetList(@RequestParam Map<String, Object> params) {
-        String clientType= (String) params.get("clientType");
-        if(StringUtils.isBlank(clientType)){
-            throw new ValidateException("clientType不能为空");
-        }
-        if(!NumConstant.ZERO_STR.equals(clientType)&&!NumConstant.ONE_STR.equals(clientType)){
-            throw new ValidateException("所属端类型0.居民端，1.政府端");
-        }
-        return new Result<ComponentListByCustomerResultDTO>().ok(customerHomeTemplateService.getComponentListByCustomer(clientType));
+    public Result<ComponentListByCustomerResultDTO> getComponetList(@RequestBody  HomeTemplateCommonFormDTO formDTO) {
+        return new Result<ComponentListByCustomerResultDTO>().ok(customerHomeTemplateService.getComponentListByCustomer(formDTO.getClientType()));
     }
 
     /**
-     * @param params clientType 所属端：0.居民端，1.领导端
+     * @param formDTO clientType 所属端：0.居民端，1.领导端
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.HomeDesignByCustomerResultDTO>
      * @author yinzuomei
      * @description 获取小程序首页配置
      * @Date 2020/8/24 22:06
      **/
     @PostMapping("gethometemplate")
-    public Result<HomeDesignByCustomerResultDTO> getHomeTemplate(@RequestParam Map<String, Object> params) {
-        String clientType = (String) params.get("clientType");
-        if (StringUtils.isBlank(clientType)) {
-            throw new ValidateException("clientType不能为空");
-        }
-        if (!NumConstant.ZERO_STR.equals(clientType) && !NumConstant.ONE_STR.equals(clientType)) {
-            throw new ValidateException("所属端类型0.居民端，1.政府端");
-        }
-        return new Result<HomeDesignByCustomerResultDTO>().ok(customerHomeTemplateService.getHomeTemplate(clientType));
+    public Result<HomeDesignByCustomerResultDTO> getHomeTemplate(@RequestBody  HomeTemplateCommonFormDTO formDTO) {
+        return new Result<HomeDesignByCustomerResultDTO>().ok(customerHomeTemplateService.getHomeTemplate(formDTO.getClientType()));
     }
 
     /**

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

@@ -44,7 +44,7 @@ public interface CustomerHomeTemplateDao extends BaseDao<CustomerHomeTemplateEnt
      * @description 通用组件列表
      * @Date 2020/8/24 21:30
      **/
-    List<CommonComponentResultDTO> selectListCommonComponent(String clientType);
+    List<CommonComponentResultDTO> selectListCommonComponent(@Param("clientType") String clientType);
 
     /**
      * @return java.util.List<com.epmet.dto.result.FunctionComponentResultDTO>
@@ -72,7 +72,7 @@ public interface CustomerHomeTemplateDao extends BaseDao<CustomerHomeTemplateEnt
      * @description 获取小程序首页配置
      * @Date 2020/8/24 22:12
      **/
-    List<CommonComponentDesignResultDTO> selectCustomerTemplate(String clientType);
+    List<CommonComponentDesignResultDTO> selectCustomerTemplate(@Param("clientType") String clientType);
 
     /**
      * @return int

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

@@ -31,10 +31,7 @@ import com.epmet.controller.CustomerHomeTemplateFormDTO;
 import com.epmet.dao.CustomerHomeTemplateDao;
 import com.epmet.dto.CustomerHomeTemplateDTO;
 import com.epmet.dto.form.HomeComponentFormDTO;
-import com.epmet.dto.result.CommonComponentDesignResultDTO;
-import com.epmet.dto.result.ComponentListByCustomerResultDTO;
-import com.epmet.dto.result.FunctionComponentResultDTO;
-import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerHomeTemplateEntity;
 import com.epmet.redis.CustomerHomeTemplateRedis;
 import com.epmet.service.CustomerHomeTemplateService;
@@ -130,7 +127,8 @@ public class CustomerHomeTemplateServiceImpl extends BaseServiceImpl<CustomerHom
     @Override
     public ComponentListByCustomerResultDTO getComponentListByCustomer(String clientType) {
         ComponentListByCustomerResultDTO resultDTO = new ComponentListByCustomerResultDTO();
-        resultDTO.setCommonList(baseDao.selectListCommonComponent(clientType));
+        List<CommonComponentResultDTO> commonList=baseDao.selectListCommonComponent(clientType);
+        resultDTO.setCommonList(commonList);
         List<FunctionComponentResultDTO> functionList = baseDao.selectListFunction();
         for (FunctionComponentResultDTO function : functionList) {
             function.setComponentList(baseDao.selectListFunctionComponent(function.getFunctionId(), clientType));

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

@@ -19,10 +19,10 @@
     </resultMap>
 
     <!--    通用组件列表查询 -->
-    <select id="selectListCommonComponent" parameterType="java.lang.String"
+    <select id="selectListCommonComponent" parameterType="map"
             resultType="com.epmet.dto.result.CommonComponentResultDTO">
         SELECT
-        hc.id AS component_id,
+        hc.id AS COMPONENT_ID,
         hc.COMPONENT_NAME,
         hc.COMPONENT_FRONT_ID,
         hc.CONFIGURATION,
@@ -78,7 +78,7 @@
     </select>
 
     <!--  获取小程序首页配置  -->
-    <select id="selectCustomerTemplate" parameterType="java.lang.String" resultType="com.epmet.dto.result.CommonComponentDesignResultDTO">
+    <select id="selectCustomerTemplate" parameterType="map" resultType="com.epmet.dto.result.CommonComponentDesignResultDTO">
         SELECT
             cht.COMPONENT_ID,
             hc.COMPONENT_NAME,