定时任务添加入参

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/ProjectStatsFormDTO.java → epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/StatsFormDTO.java

@@ -1,4 +1,4 @@
-package com.epmet.dto.project.form;
+package com.epmet.dto;
 
 import lombok.Data;
 
@@ -6,20 +6,20 @@ import java.io.Serializable;
 
 /**
  * @Author sun
- * 项目数据统计接口入参（方便后期可以手动调用）
+ * 数据统计接口入参（方便后期可以手动调用）
  */
 @Data
-public class ProjectStatsFormDTO implements Serializable {
+public class StatsFormDTO implements Serializable {
 
     private static final long serialVersionUID = -3634745091993094743L;
 
     /**
      * 客户Id
      */
-    private String customerId;
+    private String customerId = "";
     /**
      * 需要执行的日期（格式：yyyy-MM-dd）2020-01-01
      */
-    private String date;
+    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.StatsFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.issue.form.IssueJobFromDTO;
 import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBack;
@@ -135,14 +136,14 @@ public interface DataStatisticalOpenFeignClient {
   * @Author sun
   */
  @PostMapping("/data/stats/statsproject/agencyprojectstats")
- Result agencyProjectStats();
+ Result agencyProjectStats(StatsFormDTO formDTO);
 
  /**
   * @Description 数据统计-项目-网格日月统计
   * @Author sun
   */
  @PostMapping("/data/stats/statsproject/gridprojectstats")
- Result gridProjectStats();
+ Result gridProjectStats(StatsFormDTO 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.StatsFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.issue.form.IssueJobFromDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
@@ -128,8 +129,8 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @Author sun
      */
     @Override
-    public Result agencyProjectStats() {
+    public Result agencyProjectStats(StatsFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "agencyProjectStats");
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "agencyProjectStats", formDTO);
     }
 
     /**
@@ -137,8 +138,8 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @Author sun
      */
     @Override
-    public Result gridProjectStats() {
+    public Result gridProjectStats(StatsFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "gridProjectStats");
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "gridProjectStats", formDTO);
     }
 
     @Override

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

@@ -1,7 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.project.form.ProjectStatsFormDTO;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,7 +25,7 @@ public class StatsProjectController {
      * @Description 数据-项目-机关日(月)统计
      **/
     @PostMapping("agencyprojectstats")
-    public Result agencyProjectStats(@RequestBody ProjectStatsFormDTO formDTO) {
+    public Result agencyProjectStats(@RequestBody(required = false) StatsFormDTO formDTO) {
         statsProjectService.agencyProjectStats(formDTO);
         return new Result();
     }
@@ -35,7 +35,7 @@ public class StatsProjectController {
      * @Description 数据-项目-网格日(月)统计
      **/
     @PostMapping("gridprojectstats")
-    public Result gridProjectStats(@RequestBody ProjectStatsFormDTO formDTO) {
+    public Result gridProjectStats(@RequestBody(required = false) StatsFormDTO formDTO) {
         statsProjectService.gridProjectStats(formDTO);
         return new Result();
     }

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

@@ -1,6 +1,6 @@
 package com.epmet.service;
 
-import com.epmet.dto.project.form.ProjectStatsFormDTO;
+import com.epmet.dto.StatsFormDTO;
 
 /**
  * 数据统计-项目
@@ -12,11 +12,11 @@ public interface StatsProjectService {
      * @Author sun
      * @Description 数据-项目-机关日(月)统计
      **/
-    void agencyProjectStats(ProjectStatsFormDTO formDTO);
+    void agencyProjectStats(StatsFormDTO formDTO);
 
     /**
      * @Author sun
      * @Description 数据-项目-网格日(月)统计
      **/
-    void gridProjectStats(ProjectStatsFormDTO formDTO);
+    void gridProjectStats(StatsFormDTO formDTO);
 }

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

@@ -3,8 +3,8 @@ package com.epmet.service.impl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.ProjectConstant;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.project.form.MonthProjectListFormDTO;
-import com.epmet.dto.project.form.ProjectStatsFormDTO;
 import com.epmet.dto.stats.DimAgencyDTO;
 import com.epmet.entity.issue.IssueEntity;
 import com.epmet.entity.project.ProjectEntity;
@@ -16,12 +16,12 @@ import com.epmet.service.project.ProjectProcessService;
 import com.epmet.service.project.ProjectService;
 import com.epmet.service.stats.*;
 import com.epmet.util.DimIdGenerator;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 import java.text.DateFormat;
@@ -65,14 +65,14 @@ public class StatsProjectServiceImpl implements StatsProjectService {
      * @Description 数据-项目-机关日(月)统计
      **/
     @Override
-    public void agencyProjectStats(ProjectStatsFormDTO formDTO) {
+    public void agencyProjectStats(StatsFormDTO formDTO) {
         Date date = yesterDay();
         //入参有时间的则按具体时间执行,没有的则按当前时间前一天执行
-        if (null != formDTO.getDate() && StringUtils.isNotBlank(formDTO.getDate())) {
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getDate())) {
             date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN);
         }
         //入参有客户Id的则按客户Id执行，没有的则全部客户都执行
-        if (null != formDTO.getCustomerId() && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
             log.info("单独统计客户机关-项目-日月数据，当前统计的客户Id:" + formDTO.getCustomerId());
             customerAgencyStats(formDTO.getCustomerId(), date);
         } else {
@@ -367,7 +367,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
      * @Description 数据-项目-网格日(月)统计
      **/
     @Override
-    public void gridProjectStats(ProjectStatsFormDTO formDTO) {
+    public void gridProjectStats(StatsFormDTO formDTO) {
         Date date = yesterDay();
         //入参有时间的则按具体时间执行,没有的则按当前时间前一天执行
         if (null != formDTO.getDate() && StringUtils.isNotBlank(formDTO.getDate())) {

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

@@ -13,11 +13,11 @@ public interface StatsProjectService {
      * @Description 数据统计-项目-机关日月统计
      * @Author sun
      */
-    Result agencyProjectStats();
+    Result agencyProjectStats(String params);
 
     /**
      * @Description 数据统计-项目-网格日月统计
      * @Author sun
      */
-    Result gridProjectStats();
+    Result gridProjectStats(String params);
 }

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

@@ -1,8 +1,9 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.service.StatsProjectService;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
+import com.epmet.service.StatsProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,8 +22,10 @@ public class StatsProjectServiceImpl implements StatsProjectService {
      * @Author sun
      */
     @Override
-    public Result agencyProjectStats() {
+    public Result agencyProjectStats(String params) {
-        return statsPublicityFeignClient.agencyProjectStats();
+        StatsFormDTO formDTO = new StatsFormDTO();
+        formDTO.setDate(params);
+        return statsPublicityFeignClient.agencyProjectStats(formDTO);
     }
 
     /**
@@ -30,7 +33,9 @@ public class StatsProjectServiceImpl implements StatsProjectService {
      * @Author sun
      */
     @Override
-    public Result gridProjectStats() {
+    public Result gridProjectStats(String params) {
-        return statsPublicityFeignClient.gridProjectStats();
+        StatsFormDTO formDTO = new StatsFormDTO();
+        formDTO.setDate(params);
+        return statsPublicityFeignClient.gridProjectStats(formDTO);
     }
 }

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

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

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

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