From 0ed47e7c68aa2de0c4ee8f330a9c3579e7c7bfee Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 Nov 2021 15:42:36 +0800 Subject: [PATCH] =?UTF-8?q?ic=5Fresi=5Fdemand=5Fdict=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=88=B0heart,=E6=9F=A5=E8=AF=A2=E5=88=86=E7=B1=BB=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demand/UserDemandNameQueryFormDTO.java | 21 +++++++++++++++++++ .../feign/EpmetHeartOpenFeignClient.java | 5 ++++- .../EpmetHeartOpenFeignClientFallback.java | 7 ++++++- .../IcResiDemandDictController.java | 12 +++++++++++ .../com/epmet/dao/IcResiDemandDictDao.java | 3 +++ .../service/IcResiDemandDictService.java | 8 +++++++ .../impl/IcResiDemandDictServiceImpl.java | 7 +++++++ .../resources/mapper/IcResiDemandDictDao.xml | 16 ++++++++++++++ .../service/impl/IcResiUserServiceImpl.java | 15 +++++++++++-- 9 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandNameQueryFormDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandNameQueryFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandNameQueryFormDTO.java new file mode 100644 index 0000000000..3247482054 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandNameQueryFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form.demand; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.Set; + +@Data +public class UserDemandNameQueryFormDTO implements Serializable { + private static final long serialVersionUID = 1562457999313501989L; + + public interface AddUserInternalGroup {} + + @NotBlank(message = "客户idbu不能为空",groups =AddUserInternalGroup.class) + private String customerId; + + @NotEmpty(message = "分类编码不能为空",groups =AddUserInternalGroup.class) + private Set codeSet; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java index b9f4424ab3..7a4a6c8ad5 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java @@ -5,7 +5,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.ActInfoDTO; import com.epmet.dto.VolunteerInfoDTO; import com.epmet.dto.form.CommonCustomerFormDTO; -import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallback; +import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PathVariable; @@ -53,4 +53,7 @@ public interface EpmetHeartOpenFeignClient { **/ @PostMapping("/heart/resi/volunteer/queryuservolunteerinfo/{userId}") Result queryUserVolunteerInfo(@PathVariable("userId") String userId); + + @PostMapping("/heart/icresidemanddict/demangnames") + Result queryDemandNames(@RequestBody UserDemandNameQueryFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java index 23759f82c0..e0e140b02e 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java @@ -6,8 +6,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.ActInfoDTO; import com.epmet.dto.VolunteerInfoDTO; import com.epmet.dto.form.CommonCustomerFormDTO; +import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.feign.EpmetHeartOpenFeignClient; -import org.springframework.stereotype.Component; import java.util.List; @@ -48,4 +48,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli public Result queryUserVolunteerInfo(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryUserVolunteerInfo", userId); } + + @Override + public Result queryDemandNames(UserDemandNameQueryFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryDemandNames", formDTO); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcResiDemandDictController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcResiDemandDictController.java index c83b41aa4f..13779cfe13 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcResiDemandDictController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcResiDemandDictController.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcResiDemandDictDTO; +import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.service.IcResiDemandDictService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -90,4 +91,15 @@ public class IcResiDemandDictController { return new Result>().ok(icResiDemandDictService.getDemandOptions(tokenDto.getCustomerId())); } + + /** + * 居民信息列表需要展示分类名称，单独开出来这个接口，供user查询 + * @param formDTO + * @return + */ + @PostMapping("demangnames") + public Result queryDemandNames(@RequestBody UserDemandNameQueryFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,UserDemandNameQueryFormDTO.AddUserInternalGroup.class); + return icResiDemandDictService.queryDemandNames(formDTO); + } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java index 390e190f3c..94fd335929 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java @@ -24,6 +24,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Set; /** * 居民需求字典表 @@ -35,4 +36,6 @@ import java.util.List; public interface IcResiDemandDictDao extends BaseDao { List selectDemandOptions(@Param("customerId") String customerId); List selectChildDemands(@Param("customerId")String customerId, @Param("parentCode") String parentCode); + + String selectCategoryNames(@Param("customerId") String customerId,@Param("codeSet") Set codeSet); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcResiDemandDictService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcResiDemandDictService.java index 034d4fc166..d41c4303ba 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcResiDemandDictService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcResiDemandDictService.java @@ -20,7 +20,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcResiDemandDictDTO; +import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.entity.IcResiDemandDictEntity; import java.util.List; @@ -103,4 +105,10 @@ public interface IcResiDemandDictService extends BaseService getDemandOptions(String customerId); + /** + * 居民信息列表需要展示分类名称，单独开出来这个接口，供user查询 + * @param formDTO + * @return + */ + Result queryDemandNames(UserDemandNameQueryFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java index 1910a360af..fb23a85fe8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java @@ -24,8 +24,10 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcResiDemandDictDao; import com.epmet.dto.IcResiDemandDictDTO; +import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.entity.IcResiDemandDictEntity; import com.epmet.service.IcResiDemandDictService; import org.apache.commons.lang3.StringUtils; @@ -110,4 +112,9 @@ public class IcResiDemandDictServiceImpl extends BaseServiceImpl queryDemandNames(UserDemandNameQueryFormDTO formDTO) { + return new Result().ok(baseDao.selectCategoryNames(formDTO.getCustomerId(),formDTO.getCodeSet())); + } + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml index d33235f4bf..ae0c5a1e7f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml @@ -58,4 +58,20 @@ + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index eb62c090af..3c021235fd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -52,8 +52,10 @@ import com.epmet.dto.IcHouseDTO; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.form.*; +import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcResiUserEntity; +import com.epmet.feign.EpmetHeartOpenFeignClient; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.OperCustomizeOpenFeignClient; @@ -87,7 +89,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl demandNameRes=heartOpenFeignClient.queryDemandNames(userDemandNameQueryFormDTO); + if(demandNameRes.success()){ + demandName=demandNameRes.getData(); + } return demandName; }