治理实况-治理指数-接口模板

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 治理实况-当前组织治理指数-接口入参
+ * @Auth sun
+ */
+@Data
+public class AgencyGovrnFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 组织Id
+     */
+    @NotBlank(message = "组织ID不能为空",groups = AgencyGovrnFormDTO.Agency.class)
+    private String agencyId;
+    /**
+     * 日维度Id
+     */
+    private String dateId;
+    public interface Agency extends CustomerClientShowGroup {}
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 治理实况-当前网格治理指数-接口入参
+ * @Auth sun
+ */
+@Data
+public class GridGovrnFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 网格Id
+     */
+    @NotBlank(message = "网格Id不能为空",groups = GridGovrnFormDTO.Grid.class)
+    private String gridId;
+    /**
+     * 日维度Id
+     */
+    private String dateId;
+    public interface Grid extends CustomerClientShowGroup {}
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java

@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 治理实况-当前组织治理指数-接口返参
+ * @Auth sun
+ */
+@Data
+public class AgencyGovrnResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //组织Id
+    private String agencyId;
+    //组织名称
+    private String agencyName;
+    //机关级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province）
+    private String level;
+    //问题解决总数
+    private Integer a = 0;
+    //党群自治占比
+    private BigDecimal b = bi;
+    //网格自治占比
+    private BigDecimal c = bi;
+    //社区解决占比
+    private BigDecimal d = bi;
+    //区直部门解决占比
+    private BigDecimal e = bi;
+    //街道解决占比
+    private BigDecimal f = bi;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 治理实况-当前网格治理指数-接口返参
+ * @Auth sun
+ */
+@Data
+public class GridGovrnResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //网格Id
+    private String gridId;
+    //网格名称
+    private String gridName;
+    //问题解决总数
+    private Integer a = 0;
+    //党群自治占比
+    private BigDecimal b = bi;
+    //网格自治占比
+    private BigDecimal c = bi;
+
+}

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

@@ -2,10 +2,7 @@ package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.*;
-import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.*;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -159,4 +156,48 @@ public class DataStatsController {
         return new Result<List<SubGridProjectResultDTO>>().ok(dataStatsService.subGridProject(formDTO));
     }
 
+    /**
+     * @Param formDTO
+     * @Description 治理实况-当前组织治理指数
+     * @author sun
+     */
+    @PostMapping("agencygovrn")
+    public Result<AgencyGovrnResultDTO> agencyGovrn(@RequestBody AgencyGovrnFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AgencyGovrnFormDTO.Agency.class);
+        return new Result<AgencyGovrnResultDTO>().ok(dataStatsService.agencyGovrn(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织直属下级治理指数列表
+     * @author sun
+     */
+    @PostMapping("subagencygovrnlist")
+    public Result<List<AgencyGovrnResultDTO>> subAgencyGovrnList(@RequestBody AgencyGovrnFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AgencyGovrnFormDTO.Agency.class);
+        return new Result<List<AgencyGovrnResultDTO>>().ok(dataStatsService.subAgencyGovrnList(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-当前网格治理指数
+     * @author sun
+     */
+    @PostMapping("gridgovrn")
+    public Result<GridGovrnResultDTO> gridGovrn(@RequestBody GridGovrnFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GridGovrnFormDTO.Grid.class);
+        return new Result<GridGovrnResultDTO>().ok(dataStatsService.gridGovrn(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织直属网格治理指数列表
+     * @author sun
+     */
+    @PostMapping("subgridgovrnlist")
+    public Result<List<GridGovrnResultDTO>> subGridGovrnList(@RequestBody GridGovrnFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GridGovrnFormDTO.Grid.class);
+        return new Result<List<GridGovrnResultDTO>>().ok(dataStatsService.subGridGovrnList(formDTO));
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java

@@ -1,11 +1,7 @@
 package com.epmet.dataaggre.service.datastats;
 
 import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
-import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.*;
-import com.epmet.dataaggre.dto.datastats.form.PartyMemberVanguardFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.*;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
@@ -128,4 +124,32 @@ public interface DataStatsService {
     List<FactGroupActDailyDTO> querySubAnalysisByCode(String customerId, String pid, String dateId, String categoryCode);
 
     List<GroupActRankDetailDTO> selectGroupActRankDetail(String customerId, String dateId, String orgId, List<ActCategoryDictDTO> actCategoryDictDTOList);
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-当前组织治理指数
+     * @author sun
+     */
+    AgencyGovrnResultDTO agencyGovrn(AgencyGovrnFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织直属下级治理指数列表
+     * @author sun
+     */
+    List<AgencyGovrnResultDTO> subAgencyGovrnList(AgencyGovrnFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-当前网格治理指数
+     * @author sun
+     */
+    GridGovrnResultDTO gridGovrn(GridGovrnFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织直属网格治理指数列表
+     * @author sun
+     */
+    List<GridGovrnResultDTO> subGridGovrnList(GridGovrnFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -7,11 +7,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.constant.OrgConstant;
 import com.epmet.dataaggre.dao.datastats.DataStatsDao;
 import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
-import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.*;
-import com.epmet.dataaggre.dto.datastats.form.PartyMemberVanguardFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.*;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
@@ -1014,4 +1010,44 @@ public class DataStatsServiceImpl implements DataStatsService {
         return new ArrayList<>();
     }
 
+    /**
+     * @Param formDTO
+     * @Description 治理实况-当前组织治理指数
+     * @author sun
+     */
+    @Override
+    public AgencyGovrnResultDTO agencyGovrn(AgencyGovrnFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织直属下级治理指数列表
+     * @author sun
+     */
+    @Override
+    public List<AgencyGovrnResultDTO> subAgencyGovrnList(AgencyGovrnFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-当前网格治理指数
+     * @author sun
+     */
+    @Override
+    public GridGovrnResultDTO gridGovrn(GridGovrnFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织直属网格治理指数列表
+     * @author sun
+     */
+    @Override
+    public List<GridGovrnResultDTO> subGridGovrnList(GridGovrnFormDTO formDTO) {
+        return null;
+    }
+
 }