Merge branch 'dev_ic_v2' into dev_ic_data

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java

@@ -0,0 +1,35 @@
+package com.epmet.dataaggre.dto.govproject.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 赋能平台【项目处理分析】事件总数查询-接口入参
+ * @Auth sun
+ */
+@NoArgsConstructor
+@Data
+public class ProjectTotalFormDTO implements Serializable {
+    private static final long serialVersionUID = -8515172319313536407L;
+    //组织Id
+    @NotBlank(message = "组织ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class})
+    private String agencyId;
+    //日期yyyymmdd
+    @NotBlank(message = "组织ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class})
+    private String dateId;
+    //状态:待处理 pending，结案closed
+    @NotBlank(message = "项目状态不能为空", groups = {Statuslist.class})
+    private String status;
+
+    public interface Total extends CustomerClientShowGroup {
+    }
+    public interface Monthincr extends CustomerClientShowGroup {
+    }
+    public interface Statuslist extends CustomerClientShowGroup {
+    }
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.govproject.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 赋能平台【项目处理分析】进12月新增项目折线图-接口返参
+ * @Auth sun
+ */
+@Data
+public class ProjectMonthIncrResultDTO implements Serializable {
+    private static final long serialVersionUID = 6188316867855643263L;
+
+    //横坐标值
+    private String value;
+    //横坐标
+    private Integer type;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.govproject.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 赋能平台【项目处理分析】事件总数查询-接口返参
+ * @Auth sun
+ */
+@Data
+public class ProjectStatusListResultDTO implements Serializable {
+    private static final long serialVersionUID = 6188316867855643263L;
+
+    //组织Id
+    private String agencyId;
+    //项目Id
+    private String projectId;
+    //来源：议题issue  项目立项:agency 事件:resi_event
+    private Integer origin;
+    //状态:待处理 pending，结案closed
+    private Integer status;
+    //经度
+    private Integer longitude;
+    //纬度
+    private Integer dimension;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dataaggre.dto.govproject.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 赋能平台【项目处理分析】事件总数查询-接口返参
+ * @Auth sun
+ */
+@Data
+public class ProjectTotalResultDTO implements Serializable {
+    private static final long serialVersionUID = 6188316867855643263L;
+
+    //组织Id
+    private String agencyId;
+    //日期yyyymmdd
+    private String dateId;
+    //项目总数
+    private Integer projectTotal;
+    //较昨日数
+    private Integer dateIncr;
+    //较上月数
+    private Integer monthIncr;
+    //未结案项目数
+    private Integer pendingTotal;
+    //为结案项目占比 xx%
+    private String pendingRatio;
+    //已结案项目数
+    private Integer closedTotal;
+    //已结案项目占比
+    private String closedRatio;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java

@@ -8,8 +8,11 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
 import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO;
 import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectTotalResultDTO;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -56,4 +59,35 @@ public class GovProjectController {
 		ValidatorUtils.validateEntity(formDTO);
 		return new Result<List<ProjectDistributionResultDTO>>().ok(govProjectService.queryProjectDistribution(formDTO));
 	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】事件总数查询
+	 * @author sun
+	 */
+	@PostMapping("projecttotal")
+	public Result<ProjectTotalResultDTO> projectTotal(@RequestBody ProjectTotalFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Total.class);
+		return new Result<ProjectTotalResultDTO>().ok(govProjectService.projectTotal(formDTO));
+	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】进12月新增项目折线图
+	 * @author sun
+	 */
+	@PostMapping("projectmonthincr")
+	public Result<List<ProjectMonthIncrResultDTO>> projectMonthIncr(@RequestBody ProjectTotalFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Monthincr.class);
+		return new Result<List<ProjectMonthIncrResultDTO>>().ok(govProjectService.projectMonthIncr(formDTO));
+	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】按状态查询项目列表
+	 * @author sun
+	 */
+	@PostMapping("projectstatuslist")
+	public Result<List<ProjectTotalResultDTO>> projectStatusList(@RequestBody ProjectTotalFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Statuslist.class);
+		return new Result<List<ProjectTotalResultDTO>>().ok(govProjectService.projectStatusList(formDTO));
+	}
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java

@@ -4,9 +4,8 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO;
-import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
-import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.*;
-import com.epmet.dataaggre.dto.govproject.result.ShiftProjectResultDTO;
 
 import java.util.List;
 
@@ -51,4 +50,22 @@ public interface GovProjectService {
 	 * @date 2021/8/3 15:27
 	 */
 	int countRedDot(String userId);
+
+	/**
+	 * @Description 赋能平台【项目处理分析】事件总数查询
+	 * @author sun
+	 */
+    ProjectTotalResultDTO projectTotal(ProjectTotalFormDTO formDTO);
+
+	/**
+	 * @Description 赋能平台【项目处理分析】进12月新增项目折线图
+	 * @author sun
+	 */
+	List<ProjectMonthIncrResultDTO> projectMonthIncr(ProjectTotalFormDTO formDTO);
+
+	/**
+	 * @Description 赋能平台【项目处理分析】按状态查询项目列表
+	 * @author sun
+	 */
+	List<ProjectTotalResultDTO> projectStatusList(ProjectTotalFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -14,10 +14,8 @@ import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectDTO;
 import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO;
-import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
-import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.*;
-import com.epmet.dataaggre.dto.govproject.result.ProjectInfoDTO;
-import com.epmet.dataaggre.dto.govproject.result.ShiftProjectResultDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
 import com.epmet.dataaggre.service.govissue.GovIssueService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
@@ -247,4 +245,31 @@ public class GovProjectServiceImpl implements GovProjectService {
 		return projectDao.countRedDot(userId);
 	}
 
+	/**
+	 * @Description 赋能平台【项目处理分析】事件总数查询
+	 * @author sun
+	 */
+	@Override
+	public ProjectTotalResultDTO projectTotal(ProjectTotalFormDTO formDTO) {
+		return null;
+	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】进12月新增项目折线图
+	 * @author sun
+	 */
+	@Override
+	public List<ProjectMonthIncrResultDTO> projectMonthIncr(ProjectTotalFormDTO formDTO) {
+		return null;
+	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】按状态查询项目列表
+	 * @author sun
+	 */
+	@Override
+	public List<ProjectTotalResultDTO> projectStatusList(ProjectTotalFormDTO formDTO) {
+		return null;
+	}
+
 }