From 2a859c90ad3d2cae88a21ec8d86b32aa9f61e79e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 8 Dec 2021 10:23:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B3=E9=A5=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectDistributionAnalysisFormDTO.java | 4 ++ .../ProjectDistributionAnalysisRightDTO.java | 38 +++++++++++++++++++ ...ectDistributionAnalysisRightResultDTO.java | 33 ++++++++++++++++ .../epmet/controller/ProjectController.java | 13 +++++++ .../com/epmet/service/ProjectService.java | 9 +++++ .../service/impl/ProjectServiceImpl.java | 12 ++++++ 6 files changed, 109 insertions(+) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java index 745febe364..6cf6eaa2d4 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java @@ -20,4 +20,8 @@ public class ProjectDistributionAnalysisFormDTO implements Serializable { @NotBlank(message = "date不能为空",groups = ProjectDistributionAnalysisForm.class) private String date; + private String orgId; + + private String orgType; + } 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 new file mode 100644 index 0000000000..da965870b5 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java @@ -0,0 +1,38 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/12/8 10:14 上午 + * @DESC + */ +@Data +public class ProjectDistributionAnalysisRightDTO implements Serializable { + + private static final long serialVersionUID = 7233782006110358477L; + + /** + * 组织ID + */ + private String orgId; + + /** + * 组织类型，组织：agency，网格：grid + */ + private String orgType; + + /** + * 热力值 + */ + private Integer count; + + public ProjectDistributionAnalysisRightDTO() { + this.orgId = ""; + this.orgType = ""; + this.count = NumConstant.ZERO; + } +} 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 new file mode 100644 index 0000000000..1801d1c1d7 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/12/8 10:11 上午 + * @DESC + */ +@Data +public class ProjectDistributionAnalysisRightResultDTO implements Serializable { + + private static final long serialVersionUID = 8359144215262197796L; + + /** + * ..以上 + */ + private String under; + + /** + * 中间区间 + */ + private String middle; + /** + * ..以下 + */ + private String above; + + private List list; +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 085cc4c333..edaaa2bc28 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -287,4 +287,17 @@ public class ProjectController { return new Result>().ok(projectService.projectDistributionAnalysisLeft(formDTO,tokenDto)); } + /** + * @Description 【社区治理】项目分布分析-右边 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/8 10:21 上午 + */ + @PostMapping("projectdistributionanalysisright") + public Result projectDistributionAnalysisRight(@RequestBody ProjectDistributionAnalysisFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, ProjectDistributionAnalysisFormDTO.ProjectDistributionAnalysisForm.class); + return new Result().ok(projectService.projectDistributionAnalysisRight(formDTO,tokenDto)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 7a780592e1..7be2c6d71f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -342,4 +342,13 @@ public interface ProjectService extends BaseService { */ List projectDistributionAnalysisLeft(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto); + /** + * @Description 【社区治理】项目分布分析-右边 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/8 10:21 上午 + */ + ProjectDistributionAnalysisRightResultDTO projectDistributionAnalysisRight(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto); + } \ No newline at end of file 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 d393cad3a7..adeb5eae2a 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 @@ -2819,6 +2819,18 @@ public class ProjectServiceImpl extends BaseServiceImpl