From 8d7a3cf2c4c454a084580e6de38613269c55dbc5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 24 Dec 2021 11:12:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResiDemandController.java | 10 +- .../impl/IcUserDemandRecServiceImpl.java | 122 +++++++++--------- 2 files changed, 69 insertions(+), 63 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java index 39d205bdca..44d27e5793 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java @@ -156,14 +156,16 @@ public class ResiDemandController { /** * 居民端-我的需求（待处理，处理中，已完成，已取消） - * @param tokenDto + * @param tokenDto @LoginUser TokenDto tokenDto, * @param formDTO * @return */ @PostMapping("mydemand") - public Result> queryMyDemand(@LoginUser TokenDto tokenDto, @RequestBody ResiClientMyDemandFormDTO formDTO){ - formDTO.setUserId(tokenDto.getUserId()); - formDTO.setCustomerId(tokenDto.getCustomerId()); + public Result> queryMyDemand( @RequestBody ResiClientMyDemandFormDTO formDTO){ + // formDTO.setUserId(tokenDto.getUserId()); + // formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId("cebe59b05d02715141762211bf57734f"); + formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); ValidatorUtils.validateEntity(formDTO,PageFormDTO.AddUserInternalGroup.class,ResiClientMyDemandFormDTO.AddUserInternalGroup.class); return new Result>().ok(icUserDemandRecService.queryMyDemandForResiClient(formDTO)); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 3ef872f211..8c3ade3df5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -266,7 +266,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl userInfoMap=new HashMap<>(); - Set userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); + Set userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); if(CollectionUtils.isNotEmpty(userIdList)){ Result> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(new ArrayList<>(userIdList)); if(!userInfoRes.success()||CollectionUtils.isEmpty(userInfoRes.getData())){ @@ -734,7 +734,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl userInfoMap=new HashMap<>(); - Set userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); + Set userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); if(CollectionUtils.isNotEmpty(userIdList)){ Result> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(new ArrayList<>(userIdList)); if(!userInfoRes.success()||CollectionUtils.isEmpty(userInfoRes.getData())){ @@ -1091,48 +1091,50 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl list=result.getList(); if (CollectionUtils.isNotEmpty(list)) { //1、服务方（社会组织、社区自组织、区域化党建单位）单位名称，负责人姓名，负责人手机号 - List partyUnitIds = result.getList().stream().filter(l -> l.getServiceType().equals(UserDemandConstant.PARTY_UNIT)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList()); + List partyUnitIds = result.getList().stream().filter(l -> null != l.getServiceType() && l.getServiceType().equals(UserDemandConstant.PARTY_UNIT)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList()); Map partyUnitMap =getPartyUnitMap(partyUnitIds); - List socialOrgIds = result.getList().stream().filter(l -> l.getServiceType().equals(UserDemandConstant.SOCIAL_ORG)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList()); + List socialOrgIds = result.getList().stream().filter(l -> null != l.getServiceType() && l.getServiceType().equals(UserDemandConstant.SOCIAL_ORG)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList()); Map socialOrgMap=getSocialOrgMap(socialOrgIds); - List communityOrgIds = result.getList().stream().filter(l -> l.getServiceType().equals(UserDemandConstant.COMMUNITY_ORG)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList()); + List communityOrgIds = result.getList().stream().filter(l -> null != l.getServiceType() && l.getServiceType().equals(UserDemandConstant.COMMUNITY_ORG)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList()); Map communityOrgMap=getCommunityOrgMap(communityOrgIds); //2、志愿者姓名、手机号 - Set userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toSet()); + Set userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toSet()); Map userInfoMap=getVolunteerMap(userIdList); for (ResiClientMyDemandResDTO resDto : list) { //3、查询分类名称 IcResiDemandDictEntity demandDict = demandDictService.getByCode(formDTO.getCustomerId(), resDto.getCategoryCode()); resDto.setCategoryName(null != demandDict ? demandDict.getCategoryName() : StrConstant.EPMETY_STR); - switch (resDto.getServiceType()) - { - case UserDemandConstant.PARTY_UNIT: - resDto.setServiceUnitName(partyUnitMap.get(resDto.getServerId()).getUnitName()); - resDto.setServiceUserName(partyUnitMap.get(resDto.getServerId()).getContact()); - resDto.setServiceUserMobile(partyUnitMap.get(resDto.getServerId()).getContactMobile()); - break; - case UserDemandConstant.SOCIAL_ORG: - resDto.setServiceUnitName(socialOrgMap.get(resDto.getServerId()).getSocietyName()); - resDto.setServiceUserName(socialOrgMap.get(resDto.getServerId()).getPersonInCharge()); - resDto.setServiceUserMobile(socialOrgMap.get(resDto.getServerId()).getMobile()); - break; - case UserDemandConstant.COMMUNITY_ORG: - resDto.setServiceUnitName(communityOrgMap.get(resDto.getServerId()).getOrganizationName()); - resDto.setServiceUserName(communityOrgMap.get(resDto.getServerId()).getPrincipalName()); - resDto.setServiceUserMobile(communityOrgMap.get(resDto.getServerId()).getPrincipalPhone()); - break; - case UserDemandConstant.VOLUNTEER: - resDto.setServiceUnitName(StrConstant.EPMETY_STR); - resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName()); - resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile()); - break; - default: - log.warn("serviceType 错误"); - break; + if(StringUtils.isNotBlank(resDto.getServiceType())){ + switch (resDto.getServiceType()) + { + case UserDemandConstant.PARTY_UNIT: + resDto.setServiceUnitName(partyUnitMap.get(resDto.getServerId()).getUnitName()); + resDto.setServiceUserName(partyUnitMap.get(resDto.getServerId()).getContact()); + resDto.setServiceUserMobile(partyUnitMap.get(resDto.getServerId()).getContactMobile()); + break; + case UserDemandConstant.SOCIAL_ORG: + resDto.setServiceUnitName(socialOrgMap.get(resDto.getServerId()).getSocietyName()); + resDto.setServiceUserName(socialOrgMap.get(resDto.getServerId()).getPersonInCharge()); + resDto.setServiceUserMobile(socialOrgMap.get(resDto.getServerId()).getMobile()); + break; + case UserDemandConstant.COMMUNITY_ORG: + resDto.setServiceUnitName(communityOrgMap.get(resDto.getServerId()).getOrganizationName()); + resDto.setServiceUserName(communityOrgMap.get(resDto.getServerId()).getPrincipalName()); + resDto.setServiceUserMobile(communityOrgMap.get(resDto.getServerId()).getPrincipalPhone()); + break; + case UserDemandConstant.VOLUNTEER: + resDto.setServiceUnitName(StrConstant.EPMETY_STR); + resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName()); + resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile()); + break; + default: + log.warn("serviceType 错误"); + break; + } } } } @@ -1208,34 +1210,36 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl partyUnitMap = getPartyUnitMap(Arrays.asList(resDto.getServerId())); - resDto.setServiceUnitName(partyUnitMap.get(resDto.getServerId()).getUnitName()); - resDto.setServiceUserName(partyUnitMap.get(resDto.getServerId()).getContact()); - resDto.setServiceUserMobile(partyUnitMap.get(resDto.getServerId()).getContactMobile()); - break; - case UserDemandConstant.SOCIAL_ORG: - Map socialOrgMap = getSocialOrgMap(Arrays.asList(resDto.getServerId())); - resDto.setServiceUnitName(socialOrgMap.get(resDto.getServerId()).getSocietyName()); - resDto.setServiceUserName(socialOrgMap.get(resDto.getServerId()).getPersonInCharge()); - resDto.setServiceUserMobile(socialOrgMap.get(resDto.getServerId()).getMobile()); - break; - case UserDemandConstant.COMMUNITY_ORG: - Map communityOrgMap = getCommunityOrgMap(Arrays.asList(resDto.getServerId())); - resDto.setServiceUnitName(communityOrgMap.get(resDto.getServerId()).getOrganizationName()); - resDto.setServiceUserName(communityOrgMap.get(resDto.getServerId()).getPrincipalName()); - resDto.setServiceUserMobile(communityOrgMap.get(resDto.getServerId()).getPrincipalPhone()); - break; - case UserDemandConstant.VOLUNTEER: - Map userInfoMap = getVolunteerMap(new HashSet<>(Arrays.asList(resDto.getServerId()))); - resDto.setServiceUnitName(StrConstant.EPMETY_STR); - resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName()); - resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile()); - break; - default: - log.warn("serviceType 错误"); - break; + if(StringUtils.isNotBlank(resDto.getServiceType())){ + switch (resDto.getServiceType()) { + case UserDemandConstant.PARTY_UNIT: + Map partyUnitMap = getPartyUnitMap(Arrays.asList(resDto.getServerId())); + resDto.setServiceUnitName(partyUnitMap.get(resDto.getServerId()).getUnitName()); + resDto.setServiceUserName(partyUnitMap.get(resDto.getServerId()).getContact()); + resDto.setServiceUserMobile(partyUnitMap.get(resDto.getServerId()).getContactMobile()); + break; + case UserDemandConstant.SOCIAL_ORG: + Map socialOrgMap = getSocialOrgMap(Arrays.asList(resDto.getServerId())); + resDto.setServiceUnitName(socialOrgMap.get(resDto.getServerId()).getSocietyName()); + resDto.setServiceUserName(socialOrgMap.get(resDto.getServerId()).getPersonInCharge()); + resDto.setServiceUserMobile(socialOrgMap.get(resDto.getServerId()).getMobile()); + break; + case UserDemandConstant.COMMUNITY_ORG: + Map communityOrgMap = getCommunityOrgMap(Arrays.asList(resDto.getServerId())); + resDto.setServiceUnitName(communityOrgMap.get(resDto.getServerId()).getOrganizationName()); + resDto.setServiceUserName(communityOrgMap.get(resDto.getServerId()).getPrincipalName()); + resDto.setServiceUserMobile(communityOrgMap.get(resDto.getServerId()).getPrincipalPhone()); + break; + case UserDemandConstant.VOLUNTEER: + Map userInfoMap = getVolunteerMap(new HashSet<>(Arrays.asList(resDto.getServerId()))); + resDto.setServiceUnitName(StrConstant.EPMETY_STR); + resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName()); + resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile()); + break; + default: + log.warn("serviceType 错误"); + break; + } } return resDto; } From c9f6bbb68001447bc21f92c6777979e9139fbf01 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 24 Dec 2021 11:13:54 +0800 Subject: [PATCH 2/2] test --- .../com/epmet/controller/ResiDemandController.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java index 44d27e5793..be5daf5e3e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java @@ -156,16 +156,14 @@ public class ResiDemandController { /** * 居民端-我的需求（待处理，处理中，已完成，已取消） - * @param tokenDto @LoginUser TokenDto tokenDto, + * @param tokenDto * @param formDTO * @return */ @PostMapping("mydemand") - public Result> queryMyDemand( @RequestBody ResiClientMyDemandFormDTO formDTO){ - // formDTO.setUserId(tokenDto.getUserId()); - // formDTO.setCustomerId(tokenDto.getCustomerId()); - formDTO.setUserId("cebe59b05d02715141762211bf57734f"); - formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); + public Result> queryMyDemand(@LoginUser TokenDto tokenDto,@RequestBody ResiClientMyDemandFormDTO formDTO){ + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(formDTO,PageFormDTO.AddUserInternalGroup.class,ResiClientMyDemandFormDTO.AddUserInternalGroup.class); return new Result>().ok(icUserDemandRecService.queryMyDemandForResiClient(formDTO)); }