From 020f9042418a47988edc2bb8f8c591570da431f3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 21:16:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=AD=94=E9=AC=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProjectCategoryDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml index 465bd2454a..24acbb220f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml @@ -50,7 +50,7 @@ ) - SELECT * FROM project_category From 51cd0fc229da66e96024cdf2ca859b811e35597d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 21:18:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feign=E5=BC=80=E6=94=BE=E5=87=BA/gov/issue/?= =?UTF-8?q?issueprojectcategorydict/getcategorylist=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fallback/GovIssueOpenFeignClientFallBack.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index 3792ed5502..79ff8cbcfd 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -20,7 +20,6 @@ import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO; import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO; import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO; -import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; @@ -292,4 +291,15 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient public Result> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getProjectCountByGrid", formDTO); } + + /** + * @param formDTO + * @return + * @Description 批量查询分类信息 + * @Author yinzuomei + **/ + @Override + public Result> getCategoryList(IssueProjectCategoryDictListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCategoryList", formDTO); + } } From 25f38d49190dfcca13ae853fdef45bd12689ac91 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 21:19:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feign=E5=BC=80=E6=94=BE=E5=87=BA/gov/issue/?= =?UTF-8?q?issueprojectcategorydict/getcategorylist=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/feign/GovIssueOpenFeignClient.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index 19e8f00720..c62daf8ddb 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -7,7 +7,6 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack; import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBackFactory; import com.epmet.project.dto.CustomerCategoryDTO; import com.epmet.project.dto.result.ProjectCategoryDictResultDTO; @@ -362,4 +361,12 @@ public interface GovIssueOpenFeignClient { @PostMapping(value = "/gov/issue/issue/projectcountbygrid") Result> getProjectCountByGrid(@RequestBody ProjectDistributionAnalysisFormDTO formDTO); + /** + * @param formDTO + * @return + * @Description 批量查询分类信息 + * @Author yinzuomei + **/ + @PostMapping(value = "/gov/issue/issueprojectcategorydict/getcategorylist") + public Result> getCategoryList(@RequestBody IssueProjectCategoryDictListFormDTO formDTO); } From a39ebd2aac0e0a774758549be24e5dca3a4268e3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 21:20:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=B6=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index c9af6f06e4..8414cf5e4b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -357,7 +357,7 @@ ic_resi_user m WHERE m.DEL_FLAG = '0' - AND m.id != #{isResiUserId} + AND m.id != #{currentIcResiUserId} and m.HOME_ID=#{homeId} order by m.CREATED_TIME asc From bcd7cdea4f73cfaa215401607ea140ef27e1d95c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 21:56:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=A0=94=E5=88=A4?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiEventServiceImpl.java | 61 ++++++++++++++++++- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 295f0bd593..976bfcbf05 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -39,11 +39,13 @@ import com.epmet.constant.EventConstant; import com.epmet.constant.ResiEventAction; import com.epmet.dao.*; import com.epmet.dto.EventProjectInfoDTO; +import com.epmet.dto.IssueProjectCategoryDictDTO; import com.epmet.dto.ProjectCategoryDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovIssueOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ProjectCategoryService; import com.epmet.service.ResiEventService; @@ -92,6 +94,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl()); // 先判断这个项目是否有分类没有直接返回 List projectCategoryDTOList=projectCategoryService.getProjectCategoryService(formDTO.getProjectId()); if(CollectionUtils.isEmpty(projectCategoryDTOList)){ - resultDTO.setProjectData(new ArrayList<>()); return resultDTO; } + //筛选出所有的一级分类 + Set firstCategoryIds=new HashSet<>(); + for(ProjectCategoryDTO categoryDTO:projectCategoryDTOList){ + if(StringUtils.isNotBlank(categoryDTO.getCategoryPids())){ + if(NumConstant.ZERO_STR.equals(categoryDTO.getCategoryPids())){ + //当前分类就是一级分类 + firstCategoryIds.add(categoryDTO.getCategoryId()); + continue; + } + //英文逗号 + if(categoryDTO.getCategoryPids().contains(StrConstant.COMMA)){ + String[] categoryAtt=categoryDTO.getCategoryPids().split(StrConstant.COMMA); + firstCategoryIds.add(categoryAtt[NumConstant.ZERO]); + continue; + } + //可能也是英文冒号吧。。不知道是啥，所以都判断下吧 + if(categoryDTO.getCategoryPids().contains(StrConstant.COLON)){ + String[] categoryAtt=categoryDTO.getCategoryPids().split(StrConstant.COLON); + firstCategoryIds.add(categoryAtt[NumConstant.ZERO]); + continue; + } + } + } + //没有一级分类直接退出 + if(CollectionUtils.isEmpty(firstCategoryIds)){ + return resultDTO; + } + //查询这些分类的名称 //查询出当前人，在居民端小程序里上报的需求且转了项目的，并且还得排除当前的这个项目 - //todo - return null; + IssueProjectCategoryDictListFormDTO dictFormDto=new IssueProjectCategoryDictListFormDTO(); + dictFormDto.setCustomerId(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId()); + dictFormDto.setCstegoryIdList(new ArrayList(firstCategoryIds)); + Result> categoryRes=govIssueOpenFeignClient.getCategoryList(dictFormDto); + if(!categoryRes.success()||CollectionUtils.isEmpty(categoryRes.getData())){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常"); + } + List projectData=new ArrayList<>(); + for(IssueProjectCategoryDictDTO categoryDictDTO:categoryRes.getData()){ + //当前项目分类一致，排除当前项目，相同分类编码 + //todo + List projectList=null; + //projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(), + //categoryDictDTO.getCategoryCode(),formDTO.getProjectId()); + if(!CollectionUtils.isEmpty(projectList)){ + ProjectDataDTO projectDataDTO=new ProjectDataDTO(); + projectDataDTO.setFirstCategoryCode(categoryDictDTO.getCategoryCode()); + projectDataDTO.setFirstCategoryName(categoryDictDTO.getCategoryName()); + projectDataDTO.setProjectList(projectList); + projectData.add(projectDataDTO); + } + } + resultDTO.setProjectData(projectData); + return resultDTO; }