对外接口-用户、话题、小组数查询-接口模板

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

@@ -0,0 +1,33 @@
+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 SubTopicAndGroupFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 当前组织id；从组织树取
+     */
+    @NotBlank(message = "组织ID不能为空", groups = SubTopicAndGroupFormDTO.Agency.class)
+    private String agencyId;
+    /**
+     * 当前组织级别；从组织树取
+     */
+    @NotBlank(message = "组织级别不能为空", groups = SubTopicAndGroupFormDTO.Agency.class)
+    private String agencyLevel;
+    /**
+     * 日维度Id【yyyyMMdd eg：20210808，默认前一天】
+     */
+    private String dateId;
+    public interface Agency extends CustomerClientShowGroup{}
+
+}

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

@@ -0,0 +1,33 @@
+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 SubUserTotalFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 当前组织id；从组织树取
+     */
+    @NotBlank(message = "组织ID不能为空", groups = SubUserTotalFormDTO.Agency.class)
+    private String agencyId;
+    /**
+     * 当前组织级别；从组织树取
+     */
+    @NotBlank(message = "组织级别不能为空", groups = SubUserTotalFormDTO.Agency.class)
+    private String agencyLevel;
+    /**
+     * 日维度Id【yyyyMMdd eg：20210808，默认前一天】
+     */
+    private String dateId;
+    public interface Agency extends CustomerClientShowGroup{}
+
+}

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

@@ -0,0 +1,23 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 对外接口-查询下级话题和小组数-接口返参
+ * @Auth sun
+ */
+@Data
+public class SubTopicAndGroupResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    //组织或网格ID
+    private String orgId;
+    //组织或网格名称
+    private String orgName = "";
+    //问题解决总数
+    private Integer userTotal = 0;
+    //党群自治占比
+    private Integer partyMemberTotal = 0;
+
+}

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

@@ -0,0 +1,23 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 对外接口-查询下级用户党员数-接口返参
+ * @Auth sun
+ */
+@Data
+public class SubUserTotalResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    //组织或网格ID
+    private String orgId;
+    //组织或网格名称
+    private String orgName = "";
+    //问题解决总数
+    private Integer userTotal = 0;
+    //党群自治占比
+    private Integer partyMemberTotal = 0;
+
+}

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

@@ -3,7 +3,11 @@ package com.epmet.dataaggre.controller.pub;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.BaseDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.SubTopicAndGroupFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.SubUserTotalFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.BaseStatsDataResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.SubTopicAndGroupResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.SubUserTotalResultDTO;
 import com.epmet.dataaggre.dto.datastats.result.WorkFactResultDTO;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 小程序相关配置，可以放在这，目前只放了footbar
  *
@@ -51,4 +57,27 @@ public class PubController {
         ValidatorUtils.validateEntity(formDTO,BaseDataFormDTO.WorkFact.class);
         return new Result<WorkFactResultDTO>().ok(dataStatsService.getSubWorkFact(formDTO));
     }
+
+    /**
+     * @Param formDTO
+     * @Description 对外接口--查询下级用户党员数
+     * @author sun
+     */
+    @PostMapping("subUserTotal")
+    public Result<List<SubUserTotalResultDTO>> subUserTotal(@RequestBody SubUserTotalFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SubUserTotalFormDTO.Agency.class);
+        return new Result<List<SubUserTotalResultDTO>>().ok(dataStatsService.subUserTotal(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 对外接口--查询下级话题和小组数
+     * @author sun
+     */
+    @PostMapping("subTopicAndGroup")
+    public Result<List<SubTopicAndGroupResultDTO>> subTopicAndGroup(@RequestBody SubTopicAndGroupFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SubTopicAndGroupFormDTO.Agency.class);
+        return new Result<List<SubTopicAndGroupResultDTO>>().ok(dataStatsService.subTopicAndGroup(formDTO));
+    }
+
 }

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

@@ -185,4 +185,18 @@ public interface DataStatsService {
     BaseStatsDataResultDTO getBaseStatsData(BaseDataFormDTO formDTO);
 
     WorkFactResultDTO getSubWorkFact(BaseDataFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 对外接口--查询下级用户党员数
+     * @author sun
+     */
+    List<SubUserTotalResultDTO> subUserTotal(SubUserTotalFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 对外接口--查询下级话题和小组数
+     * @author sun
+     */
+    List<SubTopicAndGroupResultDTO> subTopicAndGroup(SubTopicAndGroupFormDTO formDTO);
 }

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

@@ -1516,4 +1516,37 @@ public class DataStatsServiceImpl implements DataStatsService {
         return  ratio.toString().concat("%");
     }
 
+    /**
+     * @Param formDTO
+     * @Description 对外接口--查询下级用户党员数
+     * @author sun
+     */
+    @Override
+    public List<SubUserTotalResultDTO> subUserTotal(SubUserTotalFormDTO formDTO) {
+        List<SubUserTotalResultDTO> resultList = new ArrayList<>();
+        //1.入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //2.
+        //3.
+        //4.
+
+
+        return null;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 对外接口--查询下级话题和小组数
+     * @author sun
+     */
+    @Override
+    public List<SubTopicAndGroupResultDTO> subTopicAndGroup(SubTopicAndGroupFormDTO formDTO) {
+        return null;
+    }
+
 }