右饼

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;
+
 }

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;
+    }
+}

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<ProjectDistributionAnalysisRightDTO> list;
+}

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<List<ProjectDistributionAnalysisLeftResultDTO>>().ok(projectService.projectDistributionAnalysisLeft(formDTO,tokenDto));
     }
 
+    /**
+     * @Description 【社区治理】项目分布分析-右边
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/8 10:21 上午
+     */
+    @PostMapping("projectdistributionanalysisright")
+    public Result<ProjectDistributionAnalysisRightResultDTO> projectDistributionAnalysisRight(@RequestBody ProjectDistributionAnalysisFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, ProjectDistributionAnalysisFormDTO.ProjectDistributionAnalysisForm.class);
+        return new Result<ProjectDistributionAnalysisRightResultDTO>().ok(projectService.projectDistributionAnalysisRight(formDTO,tokenDto));
+    }
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java

@@ -342,4 +342,13 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 */
 	List<ProjectDistributionAnalysisLeftResultDTO> projectDistributionAnalysisLeft(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto);
 
+	/**
+	 * @Description 【社区治理】项目分布分析-右边
+	 * @param formDTO
+	 * @param tokenDto
+	 * @author zxc
+	 * @date 2021/12/8 10:21 上午
+	 */
+	ProjectDistributionAnalysisRightResultDTO projectDistributionAnalysisRight(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto);
+
 }

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<ProjectDao, ProjectEntit
 		return disposeTimeInterval(projectCategoryByDateDTOS, formDTO.getDate(), listResult.getData());
 	}
 
+	/**
+	 * @Description 【社区治理】项目分布分析-右边
+	 * @param formDTO
+	 * @param tokenDto
+	 * @author zxc
+	 * @date 2021/12/8 10:21 上午
+	 */
+	@Override
+	public ProjectDistributionAnalysisRightResultDTO projectDistributionAnalysisRight(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto) {
+		return null;
+	}
+
 	/**
 	 * @Description  区间项目分类数量处理
 	 * @param categories