Merge branch 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/GroupStatsFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.group.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/1 16:29
+ */
+@Data
+public class GroupStatsFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -4527492073390715391L;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 日期
+     */
+    private String date;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -2,6 +2,7 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.issue.form.IssueJobFromDTO;
 import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -91,7 +92,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author zxc
   */
  @PostMapping("/data/stats/statsgroup/groupgriddaily")
- Result groupGridDaily();
+ Result groupGridDaily(@RequestBody GroupStatsFormDTO formDTO);
 
  /**
   * @Description  统计 “网格小组”， dim：【机关-日】
@@ -99,7 +100,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author zxc
   */
  @PostMapping("/data/stats/statsgroup/groupagencydaily")
- Result groupAgencyDaily();
+ Result groupAgencyDaily(@RequestBody GroupStatsFormDTO formDTO);
 
  /**
   * @Description  统计 “网格小组”， dim：【机关-月】
@@ -107,7 +108,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author zxc
   */
  @PostMapping("/data/stats/statsgroup/groupagencymonthly")
- Result groupAgencyMonthly();
+ Result groupAgencyMonthly(@RequestBody GroupStatsFormDTO formDTO);
 
  /**
   * 议题统计

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -3,6 +3,7 @@ package com.epmet.feign.impl;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.issue.form.IssueJobFromDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import org.springframework.stereotype.Component;
@@ -98,18 +99,18 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     }
 
     @Override
-    public Result groupGridDaily() {
+    public Result groupGridDaily(GroupStatsFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupGridDaily");
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupGridDaily",formDTO);
     }
 
     @Override
-    public Result groupAgencyDaily() {
+    public Result groupAgencyDaily(GroupStatsFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAgencyDaily");
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAgencyDaily",formDTO);
     }
 
     @Override
-    public Result groupAgencyMonthly() {
+    public Result groupAgencyMonthly(GroupStatsFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAgencyMonthly");
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAgencyMonthly",formDTO);
     }
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java

@@ -1,11 +1,9 @@
 package com.epmet.controller;
 
+import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.service.StatsGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Date;
 
@@ -32,8 +30,8 @@ public class StatsGroupController {
      * @author zxc
      */
     @PostMapping("groupgriddaily")
-    public void groupGridDaily(@RequestParam(value = "date",required = false)Date date){
+    public void groupGridDaily(@RequestBody GroupStatsFormDTO formDTO){
-        statsGroupService.groupGridDaily(date);
+        statsGroupService.groupGridDaily(formDTO);
     }
 
     /**
@@ -42,8 +40,8 @@ public class StatsGroupController {
      * @author zxc
      */
     @PostMapping("groupagencydaily")
-    public void groupAgencyDaily(@RequestParam(value = "date",required = false)Date date){
+    public void groupAgencyDaily(@RequestBody GroupStatsFormDTO formDTO){
-        statsGroupService.groupAgencyDaily(date);
+        statsGroupService.groupAgencyDaily(formDTO);
     }
 
     /**
@@ -52,8 +50,8 @@ public class StatsGroupController {
      * @author zxc
      */
     @PostMapping("groupagencymonthly")
-    public void groupAgencyMonthly(@RequestParam(value = "date",required = false)Date date){
+    public void groupAgencyMonthly(@RequestBody GroupStatsFormDTO formDTO){
-        statsGroupService.groupAgencyMonthly(date);
+        statsGroupService.groupAgencyMonthly(formDTO);
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java

@@ -1,5 +1,7 @@
 package com.epmet.service;
 
+import com.epmet.dto.group.form.GroupStatsFormDTO;
+
 import java.util.Date;
 
 /**
@@ -12,18 +14,18 @@ public interface StatsGroupService {
      * @Description  统计 “小组” 有关数据， dim：【网格-日】
      * @author zxc
      */
-    void groupGridDaily(Date date);
+    void groupGridDaily(GroupStatsFormDTO formDTO);
 
     /**
      * @Description  统计 “小组” 有关数据， dim：【机关-日】
      * @author zxc
      */
-    void groupAgencyDaily(Date date);
+    void groupAgencyDaily(GroupStatsFormDTO formDTO);
 
     /**
      * @Description  统计 “小组” 有关数据， dim：【机关-月】
      * @author zxc
      */
-    void groupAgencyMonthly(Date date);
+    void groupAgencyMonthly(GroupStatsFormDTO formDTO);
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java

@@ -1,9 +1,11 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.GroupConstant;
 import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.group.form.AgencyMonthlyFormDTO;
+import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.result.*;
 import com.epmet.dto.stats.DimAgencyDTO;
 import com.epmet.entity.stats.DimAgencyEntity;
@@ -56,13 +58,13 @@ public class StatsGroupServiceImpl implements StatsGroupService {
      * @author zxc
      */
     @Override
-    public void groupGridDaily(Date date) {
+    public void groupGridDaily(GroupStatsFormDTO formDTO) {
         Integer pageNo = NumConstant.ONE;
         Integer pageSize = NumConstant.ONE_HUNDRED;
         List<String> customerIds;
         do {
             customerIds = dimCustomerService.selectCustomerIdPage(pageNo,pageSize);
-            DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date);
+            DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO);
             if (customerIds.size() != NumConstant.ZERO){
                 customerIds.forEach(customerId -> {
                     try {
@@ -83,14 +85,14 @@ public class StatsGroupServiceImpl implements StatsGroupService {
      * @author zxc
      */
     @Override
-    public void groupAgencyDaily(Date date) {
+    public void groupAgencyDaily(GroupStatsFormDTO formDTO) {
         Integer pageNo = NumConstant.ONE;
         Integer pageSize = NumConstant.ONE_HUNDRED;
         List<String> customerIds;
         do {
             customerIds = dimCustomerService.selectCustomerIdPage(pageNo++,pageSize);
             if (customerIds.size() != NumConstant.ZERO){
-                DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date);
+                DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO);
                 customerIds.forEach(customerId -> {
                     try {
                         List<DimAgencyDTO> customerAgencyInfos = dimAgencyService.getAgencyInfoByCustomerId(customerId);
@@ -109,8 +111,8 @@ public class StatsGroupServiceImpl implements StatsGroupService {
      * @author zxc   String customerId
      */
     @Override
-    public void groupAgencyMonthly(Date date) {
+    public void groupAgencyMonthly(GroupStatsFormDTO formDTO) {
-        DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date);
+        DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO);
         String monthId = dimIdBean.getMonthId();
         List<AgencyMonthlyFormDTO> lastDayAgency = factGroupAgencyDailyService.getLastDayAgency(monthId);
         List<AgencyGroupMonthlyResultDTO> monthGroupIncr = factGroupAgencyDailyService.getMonthGroupIncr(monthId);
@@ -308,9 +310,9 @@ public class StatsGroupServiceImpl implements StatsGroupService {
      * @param
      * @author zxc
      */
-    public DimIdGenerator.DimIdBean getDimIdBean(Date date){
+    public DimIdGenerator.DimIdBean getDimIdBean(GroupStatsFormDTO formDTO){
-        if (date != null){
+        if (formDTO.getDate() != null){
-            return DimIdGenerator.getDimIdBean(date);
+            return DimIdGenerator.getDimIdBean(DateUtils.parse(formDTO.getDate(),DateUtils.DATE_PATTERN));
         }
         ZoneId zoneId = ZoneId.systemDefault();
         LocalDate localDate = LocalDate.now().minusDays(NumConstant.ONE);

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsGroupService.java

@@ -13,20 +13,20 @@ public interface StatsGroupService {
      * @param
      * @author zxc
      */
-    Result groupGridDaily();
+    Result groupGridDaily(String date);
 
     /**
      * @Description  统计 “网格小组”， dim：【机关-日】
      * @param
      * @author zxc
      */
-    Result groupAgencyDaily();
+    Result groupAgencyDaily(String date);
 
     /**
      * @Description  统计 “网格小组”， dim：【机关-月】
      * @param
      * @author zxc
      */
-    Result groupAgencyMonthly();
+    Result groupAgencyMonthly(String date);
 
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.service.StatsGroupService;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,17 +18,23 @@ public class StatsGroupServiceImpl implements StatsGroupService {
     private DataStatisticalOpenFeignClient statsPublicityFeignClient;
 
     @Override
-    public Result groupGridDaily() {
+    public Result groupGridDaily(String date) {
-        return statsPublicityFeignClient.groupGridDaily();
+        GroupStatsFormDTO formDTO = new GroupStatsFormDTO();
+        formDTO.setDate(date);
+        return statsPublicityFeignClient.groupGridDaily(formDTO);
     }
 
     @Override
-    public Result groupAgencyDaily() {
+    public Result groupAgencyDaily(String date) {
-        return statsPublicityFeignClient.groupAgencyDaily();
+        GroupStatsFormDTO formDTO = new GroupStatsFormDTO();
+        formDTO.setDate(date);
+        return statsPublicityFeignClient.groupAgencyDaily(formDTO);
     }
 
     @Override
-    public Result groupAgencyMonthly() {
+    public Result groupAgencyMonthly(String date) {
-        return statsPublicityFeignClient.groupAgencyMonthly();
+        GroupStatsFormDTO formDTO = new GroupStatsFormDTO();
+        formDTO.setDate(date);
+        return statsPublicityFeignClient.groupAgencyMonthly(formDTO);
     }
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java

@@ -24,7 +24,7 @@ public class StatsGroupAgencyDailyTask implements ITask {
     @Override
     public void run(String params) {
         logger.debug("StatsGroupAgencyDailyTask定时任务正在执行，参数为：{}", params);
-        Result result = statsGroupService.groupAgencyDaily();
+        Result result = statsGroupService.groupAgencyDaily(params);
         if (result.success()){
             logger.debug("StatsGroupAgencyDailyTask定时任务正在执行定时任务执行成功");
         }else {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java

@@ -24,7 +24,7 @@ public class StatsGroupAgencyMonthlyTask implements ITask {
     @Override
     public void run(String params) {
         logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行，参数为：{}", params);
-        Result result = statsGroupService.groupAgencyMonthly();
+        Result result = statsGroupService.groupAgencyMonthly(params);
         if (result.success()){
             logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行定时任务执行成功");
         }else {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java

@@ -25,7 +25,7 @@ public class StatsGroupGridDailyTask implements ITask {
     @Override
     public void run(String params) {
         logger.debug("StatsGroupGridDailyTask定时任务正在执行，参数为：{}", params);
-        Result result = statsGroupService.groupGridDaily();
+        Result result = statsGroupService.groupGridDaily(params);
         if (result.success()){
             logger.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行成功");
         }else {