数据推送定时任务修改

epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.ItemCountParamDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenProjectFormDTO;
 import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback;
@@ -671,24 +672,24 @@ public interface AnalysisFeignClient {
     /**
      * 网格项目数据
      *
-     * @param formDto 定时入参
+     * @param itemCountParamDTO 定时入参
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author zhy
      * @date 2021/6/28 10:57
      */
     @PostMapping("analysis/data/stats/basereport/gridproject")
-    Result gridproject(ScreenJobFormDTO formDto);
+    Result gridproject(ItemCountParamDTO itemCountParamDTO);
 
     /**
      * 组织项目数据
      *
-     * @param formDto 定时入参
+     * @param itemCountParamDTO 定时入参
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author zhy
      * @date 2021/6/28 10:57
      */
     @PostMapping("analysis/data/stats/basereport/agencyproject")
-    Result agencyproject(ScreenJobFormDTO formDto);
+    Result agencyproject(ItemCountParamDTO itemCountParamDTO);
 
     /**
      * 网格群组总数

epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.ItemCountParamDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenProjectFormDTO;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
@@ -322,12 +323,12 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
     }
 
     @Override
-    public Result gridproject(ScreenJobFormDTO formDto) {
+    public Result gridproject(ItemCountParamDTO itemCountParamDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridproject");
     }
 
     @Override
-    public Result agencyproject(ScreenJobFormDTO formDto) {
+    public Result agencyproject(ItemCountParamDTO itemCountParamDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "agencyproject");
     }
 

epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportPushTaskImpl.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.task.screen;
 
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.dto.ScreenBaseReportParamDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.ItemCountParamDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import org.apache.commons.lang3.StringUtils;
@@ -52,9 +53,13 @@ public class ScreenBaseReportPushTaskImpl implements ScreenBaseReportPushTask {
 
         agencytopicissue(paramDto.getAgencytopicissue());
 
-        gridproject(paramDto.getGridproject());
+        ItemCountParamDTO itemCountParamDTO = new ItemCountParamDTO();
+        itemCountParamDTO = JSONObject.parseObject(param, ItemCountParamDTO.class);
+        itemCountParamDTO.setEndTime(itemCountParamDTO.getEndTime());
+        itemCountParamDTO.setStartTime(itemCountParamDTO.getStartTime());
+        gridproject(itemCountParamDTO);
 
-        agencyproject(paramDto.getAgencyproject());
+        agencyproject(itemCountParamDTO);
 
         gridgrouptotal(paramDto.getGridgrouptotal());
 
@@ -245,36 +250,33 @@ public class ScreenBaseReportPushTaskImpl implements ScreenBaseReportPushTask {
     /**
      * 网格项目数据
      *
-     * @param yearMonth
+     * @param itemCountParamDTO
      * @return void
      * @author zhy
      * @date 2021/6/28 10:48
      */
-    public void gridproject(String yearMonth) {
+    public void gridproject(ItemCountParamDTO itemCountParamDTO) {
-        ScreenJobFormDTO formDto = new ScreenJobFormDTO();
-        formDto.setYearMonth(yearMonth);
         // 方法名
         String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
         logger.info("<" + methodName + "|网格项目数据>定时任务开始执行");
-        analysisFeignClient.gridproject(formDto);
+        analysisFeignClient.gridproject(itemCountParamDTO);
         logger.info("<" + methodName + "|网格项目数据>定时任务执行结束");
     }
 
     /**
      * 组织项目数据
      *
-     * @param yearMonth
+     * @param itemCountParamDTO
      * @return void
      * @author zhy
      * @date 2021/6/28 10:48
      */
-    public void agencyproject(String yearMonth) {
+    public void agencyproject(ItemCountParamDTO itemCountParamDTO) {
         ScreenJobFormDTO formDto = new ScreenJobFormDTO();
-        formDto.setYearMonth(yearMonth);
         // 方法名
         String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
         logger.info("<" + methodName + "|组织项目数据>定时任务开始执行");
-        analysisFeignClient.agencyproject(formDto);
+        analysisFeignClient.agencyproject(itemCountParamDTO);
         logger.info("<" + methodName + "|组织项目数据>定时任务执行结束");
     }