From f0dad87436fc4ab89ef80d6dbdc7133e668b017f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 9 Dec 2021 15:27:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=B8=8B=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/GovIssueOpenFeignClient.java | 9 ++++++++ .../GovIssueOpenFeignClientFallBack.java | 5 +++++ .../com/epmet/controller/IssueController.java | 11 ++++++++++ .../src/main/java/com/epmet/dao/IssueDao.java | 8 +++++++ .../java/com/epmet/service/IssueService.java | 8 +++++++ .../epmet/service/impl/IssueServiceImpl.java | 15 +++++++++++++ .../src/main/resources/mapper/IssueDao.xml | 14 ++++++++++++ .../ProjectDistributionAnalysisRightDTO.java | 2 ++ ...ectDistributionAnalysisRightResultDTO.java | 8 +++++++ .../com/epmet/constant/ProjectConstant.java | 2 ++ .../service/impl/ProjectServiceImpl.java | 22 ++++++++++++++++++- 11 files changed, 103 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 5e67e24217..19e8f00720 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 @@ -353,4 +353,13 @@ public interface GovIssueOpenFeignClient { @PostMapping(value = "/gov/issue/issueprojectcategorydict/categorylist") Result> selectCategoryOneLevelListByCustomerId(@LoginUser TokenDto tokenDto); + /** + * @Description 查询组织下每个网格的项目数 + * @param formDTO + * @author zxc + * @date 2021/12/9 2:59 下午 + */ + @PostMapping(value = "/gov/issue/issue/projectcountbygrid") + Result> getProjectCountByGrid(@RequestBody ProjectDistributionAnalysisFormDTO formDTO); + } 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 bc947a7617..3792ed5502 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 @@ -287,4 +287,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient public Result> selectCategoryOneLevelListByCustomerId(TokenDto tokenDto) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "selectCategoryOneLevelListByCustomerId", tokenDto); } + + @Override + public Result> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getProjectCountByGrid", formDTO); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index 1058f54ce8..55f1348b44 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -311,5 +311,16 @@ public class IssueController { return new Result>().ok(issueService.resiBuzzLeftPieChart(formDTO,tokenDto)); } + /** + * @Description 查询组织下每个网格的项目数 + * @param formDTO + * @author zxc + * @date 2021/12/9 2:59 下午 + */ + @PostMapping("projectcountbygrid") + public Result> getProjectCountByGrid(@RequestBody ProjectDistributionAnalysisFormDTO formDTO){ + return new Result>().ok(issueService.getProjectCountByGrid(formDTO)); + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index 66584d76ba..f7ef6c86f5 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -254,4 +254,12 @@ public interface IssueDao extends BaseDao { */ List resiBuzzLeftPieChart(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("length")Integer length); + /** + * @Description 查询组织下每个网格的项目数 + * @param orgId + * @author zxc + * @date 2021/12/9 2:59 下午 + */ + List getProjectCountByGrid(@Param("orgId")String orgId,@Param("startDate")String startDate,@Param("endDate")String endDate); + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index e85b8c69e9..4eca209b95 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -369,4 +369,12 @@ public interface IssueService extends BaseService { */ List resiBuzzLeftPieChart(ResiBuzzLeftPieChartFormDTO formDTO,TokenDto tokenDto); + /** + * @Description 查询组织下每个网格的项目数 + * @param formDTO + * @author zxc + * @date 2021/12/9 2:59 下午 + */ + List getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO); + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 05b146ac8c..e77be90639 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1638,5 +1638,20 @@ public class IssueServiceImpl extends BaseServiceImpl imp return result; } + /** + * @Description 查询组织下每个网格的项目数 + * @param formDTO + * @author zxc + * @date 2021/12/9 2:59 下午 + */ + @Override + public List getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) { + List result = baseDao.getProjectCountByGrid(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); + if (CollectionUtils.isEmpty(result)){ + return new ArrayList<>(); + } + return result; + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 5067b9c8cd..646fdd33e0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -639,4 +639,18 @@ ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50)temp GROUP BY categoryCode + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java index da965870b5..d48a225007 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java @@ -1,6 +1,7 @@ package com.epmet.dto.result; import com.epmet.commons.tools.constant.NumConstant; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -23,6 +24,7 @@ public class ProjectDistributionAnalysisRightDTO implements Serializable { /** * 组织类型，组织：agency，网格：grid */ + @JsonIgnore private String orgType; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java index 1801d1c1d7..5b52084e9d 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -30,4 +31,11 @@ public class ProjectDistributionAnalysisRightResultDTO implements Serializable { private String above; private List list; + + public ProjectDistributionAnalysisRightResultDTO() { + this.under = ""; + this.middle = ""; + this.above = ""; + this.list = new ArrayList<>(); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java index 205d91bc3d..612debd512 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java @@ -197,4 +197,6 @@ public interface ProjectConstant { String ORG_TYPE_GRID = "grid"; + String ORG_LEVEL_COMMUNITY = "community"; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 3588aeefb1..8b0376db17 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -28,7 +28,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; @@ -2845,7 +2847,25 @@ public class ProjectServiceImpl extends BaseServiceImpl orgList = new ArrayList<>(); + if (!agencyInfo.getLevel().equals(ProjectConstant.ORG_LEVEL_COMMUNITY)){ + + }else { + + } + return result; } /**