From 79648bf03c39283e2e439e2d14f833727a594e1e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Aug 2020 10:58:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/HomeTemplateCommonFormDTO.java | 30 +++++++++++++++++++ .../CustomerHomeTemplateController.java | 27 +++++------------ .../epmet/dao/CustomerHomeTemplateDao.java | 4 +-- .../impl/CustomerHomeTemplateServiceImpl.java | 8 ++--- .../mapper/CustomerHomeTemplateDao.xml | 6 ++-- 5 files changed, 45 insertions(+), 30 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/HomeTemplateCommonFormDTO.java diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/HomeTemplateCommonFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/HomeTemplateCommonFormDTO.java new file mode 100644 index 0000000000..d692367b38 --- /dev/null +++ b/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; + } +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeTemplateController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeTemplateController.java index 084384e457..99fd872b92 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeTemplateController.java +++ b/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 - * @param params clientType 所属端：0.居民端，1.领导端 + * @param formDTO clientType 所属端：0.居民端，1.领导端 * @author yinzuomei * @description 获取可用组件列表 * @Date 2020/8/24 21:15 **/ @PostMapping("getcomponentlist") - public Result getComponetList(@RequestParam Map 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().ok(customerHomeTemplateService.getComponentListByCustomer(clientType)); + public Result getComponetList(@RequestBody HomeTemplateCommonFormDTO formDTO) { + return new Result().ok(customerHomeTemplateService.getComponentListByCustomer(formDTO.getClientType())); } /** - * @param params clientType 所属端：0.居民端，1.领导端 + * @param formDTO clientType 所属端：0.居民端，1.领导端 * @return com.epmet.commons.tools.utils.Result * @author yinzuomei * @description 获取小程序首页配置 * @Date 2020/8/24 22:06 **/ @PostMapping("gethometemplate") - public Result getHomeTemplate(@RequestParam Map 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().ok(customerHomeTemplateService.getHomeTemplate(clientType)); + public Result getHomeTemplate(@RequestBody HomeTemplateCommonFormDTO formDTO) { + return new Result().ok(customerHomeTemplateService.getHomeTemplate(formDTO.getClientType())); } /** diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeTemplateDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeTemplateDao.java index 351a961d85..f11dab0bc7 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeTemplateDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeTemplateDao.java @@ -44,7 +44,7 @@ public interface CustomerHomeTemplateDao extends BaseDao selectListCommonComponent(String clientType); + List selectListCommonComponent(@Param("clientType") String clientType); /** * @return java.util.List @@ -72,7 +72,7 @@ public interface CustomerHomeTemplateDao extends BaseDao selectCustomerTemplate(String clientType); + List selectCustomerTemplate(@Param("clientType") String clientType); /** * @return int diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeTemplateServiceImpl.java index 7bd87b2b41..b94f5ad8c4 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeTemplateServiceImpl.java +++ b/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 commonList=baseDao.selectListCommonComponent(clientType); + resultDTO.setCommonList(commonList); List functionList = baseDao.selectListFunction(); for (FunctionComponentResultDTO function : functionList) { function.setComponentList(baseDao.selectListFunctionComponent(function.getFunctionId(), clientType)); diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeTemplateDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeTemplateDao.xml index 3813fbd9ca..c47c431bb9 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeTemplateDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeTemplateDao.xml @@ -19,10 +19,10 @@ - - SELECT cht.COMPONENT_ID, hc.COMPONENT_NAME,