diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index 19baa54..11db02c 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/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.GmUploaddataParamDTO; 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; @@ -720,7 +721,7 @@ public interface AnalysisFeignClient { * @Param [customId] **/ @PostMapping("analysis/girdManager/gridManagerUploadData") - Result selectGridManagerUploadData(); + Result selectGridManagerUploadData(GmUploaddataParamDTO paramDto); /** * @Description 网格员事件总数上报 diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index 1e5b970..f9aab62 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/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.GmUploaddataParamDTO; 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; @@ -343,7 +344,7 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { } @Override - public Result selectGridManagerUploadData() { + public Result selectGridManagerUploadData(GmUploaddataParamDTO paramDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectGridManagerUploadData"); } diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerDataTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerDataTaskImpl.java index 5b742f7..35bc314 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerDataTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerDataTaskImpl.java @@ -1,6 +1,9 @@ package com.elink.esua.epdc.task.screen; +import com.alibaba.fastjson.JSONObject; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.GmUploaddataParamDTO; import com.elink.esua.epdc.feign.AnalysisFeignClient; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -24,16 +27,21 @@ public class ScreenGridManagerDataTaskImpl implements ScreenIndexDataPushTask { @Override public void run(String param) { + // 参数处理 + GmUploaddataParamDTO paramDto = new GmUploaddataParamDTO(); + if (StringUtils.isNotEmpty(param)) { + paramDto = JSONObject.parseObject(param, GmUploaddataParamDTO.class); + } // 网格员数据管理 - gridManagerUploadData(); + gridManagerUploadData(paramDto); } - private void gridManagerUploadData() { + private void gridManagerUploadData(GmUploaddataParamDTO paramDto) { // 方法名 String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); logger.info("<" + methodName + "|【网格员管理】网格员数据管理>定时任务开始执行"); - analysisFeignClient.selectGridManagerUploadData(); + analysisFeignClient.selectGridManagerUploadData(paramDto); logger.info("<" + methodName + "|【网格员管理】网格员数据管理>定时任务执行结束"); }