From 3f24e6c2766380f51ff6a5889d6fe193d716d207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Fri, 1 Mar 2024 15:51:33 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=B0=83=E5=BA=A6=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BB=A3=E7=A0=81=E9=92=88=E5=AF=B9=E6=B2=B3=E5=8C=97?= =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E6=B7=BB=E5=8A=A0=E8=A1=A5=E6=8B=9B=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/system/controller/TimersController.java | 6 ++++-- .../java/com/njcn/system/service/ITimersService.java | 2 +- .../njcn/system/service/impl/TimersServiceImpl.java | 8 ++++---- .../java/com/njcn/system/timer/TimerTaskRunner.java | 5 ++++- .../system/timer/impl/HutoolTimerExeServiceImpl.java | 2 +- .../com/njcn/system/timer/tasks/DeviceTaskRunner.java | 11 +++++++++-- .../njcn/system/timer/tasks/GeneraTrixTaskRunner.java | 11 +++++++++-- .../system/timer/tasks/MeasurementTaskRunner.java | 11 +++++++++-- .../timer/tasks/MonitorSendOtherUserTaskRunner.java | 2 +- .../tasks/MonitorSendPhotovoltaicTaskRunner.java | 2 +- .../system/timer/tasks/MonitorSendTaskRunner.java | 2 +- .../tasks/MonitorSendTractionStationTaskRunner.java | 2 +- .../system/timer/tasks/MonitorUserSendTaskRunner.java | 2 +- .../com/njcn/system/timer/tasks/OrgTaskRunner.java | 9 +++++++-- .../com/njcn/system/timer/tasks/PmsDimTaskRunner.java | 9 +++++++-- .../timer/tasks/PmsMonitorLimitSendTaskRunner.java | 2 +- .../system/timer/tasks/PmsMonitorSendTaskRunner.java | 2 +- .../tasks/PmsStatisticsSpecialMonitorTaskRunner.java | 2 +- .../system/timer/tasks/PqTypicalSourceTaskRunner.java | 2 +- .../system/timer/tasks/RMpEmissionTaskRunner.java | 2 +- .../system/timer/tasks/RMpInfluenceTaskRunner.java | 2 +- .../system/timer/tasks/StatisticReportTaskRunner.java | 2 +- .../njcn/system/timer/tasks/SubstationTaskRunner.java | 9 +++++++-- .../njcn/system/timer/tasks/UploadGwOrgAllRunner.java | 2 +- .../timer/tasks/UploadGwTaskEvaluationRunner.java | 2 +- .../njcn/system/timer/tasks/UploadGwTaskRunner.java | 2 +- .../timer/tasks/UploadGwTaskSubstationRunner.java | 2 +- .../njcn/system/timer/tasks/UserLogTaskRunner.java | 2 +- .../tasks/specialAnalysisIndexOverviewTaskRunner.java | 2 +- 29 files changed, 80 insertions(+), 39 deletions(-) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/TimersController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/TimersController.java index c68544d41..ed13b661a 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/TimersController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/TimersController.java @@ -13,6 +13,7 @@ import com.njcn.common.utils.LogUtil; import com.njcn.system.pojo.param.TimersParam; import com.njcn.system.pojo.vo.TimersVO; import com.njcn.system.service.ITimersService; +import com.njcn.web.pojo.annotation.DateTimeStrValid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -168,13 +169,14 @@ public class TimersController extends BaseController { * 执行一次定时任务 * * @author hongawen + * @param date 需要执行的日期 */ @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/run") @ApiOperation("执行一次定时任务") - public HttpResult run(String id) throws InterruptedException { + public HttpResult run(@RequestParam("id") String id,@RequestParam(required = false) @DateTimeStrValid String date) throws InterruptedException { String methodDescribe = getMethodDescribe("run"); - timersService.run(id); + timersService.run(id,date); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/ITimersService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/ITimersService.java index feb719f56..94795d662 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/ITimersService.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/ITimersService.java @@ -32,5 +32,5 @@ public interface ITimersService extends IService { void stop(String id); - void run(String id) throws InterruptedException; + void run(String id,String date) throws InterruptedException; } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/TimersServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/TimersServiceImpl.java index d82acb990..1f73c49e7 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/TimersServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/TimersServiceImpl.java @@ -136,7 +136,7 @@ public class TimersServiceImpl extends ServiceImpl impleme } @Override - public void run(String id) throws InterruptedException { + public void run(String id,String date) throws InterruptedException { Timers sysTimers = this.queryTimers(id); String actionClass = sysTimers.getActionClass(); TimerTaskRunner timerTaskRunner; @@ -145,7 +145,7 @@ public class TimersServiceImpl extends ServiceImpl impleme } catch (ClassNotFoundException e) { throw new BusinessException(SystemResponseEnum.TIMER_NO_CLASS); } - runTaskWithRetryAndDelay(timerTaskRunner); + runTaskWithRetryAndDelay(timerTaskRunner,date); } /** @@ -162,12 +162,12 @@ public class TimersServiceImpl extends ServiceImpl impleme return timers; } - public void runTaskWithRetryAndDelay(TimerTaskRunner timerTaskRunner) throws InterruptedException { + public void runTaskWithRetryAndDelay(TimerTaskRunner timerTaskRunner,String date) throws InterruptedException { int retryCount = 0; // 重试次数计数器 while (retryCount < maxRetryCount) { try { System.out.println("重试机制："+(retryCount+1)); - timerTaskRunner.action(); + timerTaskRunner.action(date); System.out.println("成功重试机制："+(retryCount+1)); return; // 任务执行成功，跳出循环 } catch (Exception e) { diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/TimerTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/TimerTaskRunner.java index 39d45878d..46c053542 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/TimerTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/TimerTaskRunner.java @@ -14,6 +14,9 @@ public interface TimerTaskRunner { * * @author hongawen */ - void action(); + void action(String date); + + + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/impl/HutoolTimerExeServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/impl/HutoolTimerExeServiceImpl.java index 0d5885015..1361169b9 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/impl/HutoolTimerExeServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/impl/HutoolTimerExeServiceImpl.java @@ -66,7 +66,7 @@ public class HutoolTimerExeServiceImpl implements TimerExeService { while (retryCount < maxRetryCount) { try { System.out.println("重试机制："+(retryCount+1)); - timerTaskRunner.action(); + timerTaskRunner.action(null); return; // 任务执行成功，跳出循环 } catch (Exception e) { // 处理异常 diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/DeviceTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/DeviceTaskRunner.java index 12ce7090d..7d434ea42 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/DeviceTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/DeviceTaskRunner.java @@ -2,6 +2,7 @@ package com.njcn.system.timer.tasks; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient; import com.njcn.prepare.harmonic.pojo.bo.BaseParam; import com.njcn.system.timer.TimerTaskRunner; @@ -22,11 +23,17 @@ public class DeviceTaskRunner implements TimerTaskRunner { private final LiteFlowFeignClient liteFlowFeignClient; @Override - public void action() { + public void action(String date) { BaseParam baseParam = new BaseParam(); baseParam.setFullChain(true); baseParam.setRepair(false); - baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + if(StrUtil.isBlank(date)){ + baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + }else { + baseParam.setDataDate(date); + } liteFlowFeignClient.deviceExecutor(baseParam); } + + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/GeneraTrixTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/GeneraTrixTaskRunner.java index d29e1da06..57dc2bdbb 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/GeneraTrixTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/GeneraTrixTaskRunner.java @@ -2,6 +2,7 @@ package com.njcn.system.timer.tasks; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient; import com.njcn.prepare.harmonic.pojo.bo.BaseParam; import com.njcn.system.timer.TimerTaskRunner; @@ -22,11 +23,17 @@ public class GeneraTrixTaskRunner implements TimerTaskRunner { private final LiteFlowFeignClient liteFlowFeignClient; @Override - public void action() { + public void action(String date) { BaseParam baseParam = new BaseParam(); baseParam.setFullChain(true); baseParam.setRepair(false); - baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + if(StrUtil.isBlank(date)){ + baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + }else { + baseParam.setDataDate(date); + } liteFlowFeignClient.generaTrixExecutor(baseParam); } + + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementTaskRunner.java index 8ab887a42..31e0c13a9 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementTaskRunner.java @@ -2,6 +2,7 @@ package com.njcn.system.timer.tasks; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient; import com.njcn.prepare.harmonic.pojo.bo.BaseParam; import com.njcn.system.timer.TimerTaskRunner; @@ -22,11 +23,17 @@ public class MeasurementTaskRunner implements TimerTaskRunner { private final LiteFlowFeignClient liteFlowFeignClient; @Override - public void action() { + public void action(String date) { BaseParam baseParam = new BaseParam(); baseParam.setFullChain(true); baseParam.setRepair(false); - baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + if(StrUtil.isBlank(date)){ + baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + }else { + baseParam.setDataDate(date); + } liteFlowFeignClient.measurementPointExecutor(baseParam); } + + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendOtherUserTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendOtherUserTaskRunner.java index 4fd729989..b14a461e9 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendOtherUserTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendOtherUserTaskRunner.java @@ -24,7 +24,7 @@ public class MonitorSendOtherUserTaskRunner implements TimerTaskRunner { @Override - public void action() { + public void action(String date) { List dictTreeVOS = sysDicTreePOService.queryByPid("0"); for (DictTreeVO dictTreeVO : dictTreeVOS) { if(dictTreeVO.getCode().equals("1401")|| diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendPhotovoltaicTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendPhotovoltaicTaskRunner.java index 041dbb8ce..ec8875190 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendPhotovoltaicTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendPhotovoltaicTaskRunner.java @@ -21,7 +21,7 @@ public class MonitorSendPhotovoltaicTaskRunner implements TimerTaskRunner { @Override - public void action() { + public void action(String date) { //光伏电站 MonitorParam.Info param1 = new MonitorParam.Info(); param1.setObjType(sysDicTreePOService.queryByCode("1402").getId()); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendTaskRunner.java index 634fda871..c2b66975b 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendTaskRunner.java @@ -21,7 +21,7 @@ public class MonitorSendTaskRunner implements TimerTaskRunner { @Override - public void action() { + public void action(String date) { //风电场 MonitorParam.Info param = new MonitorParam.Info(); param.setObjType(sysDicTreePOService.queryByCode("1401").getId()); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendTractionStationTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendTractionStationTaskRunner.java index e4a5481d7..58f917439 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendTractionStationTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendTractionStationTaskRunner.java @@ -21,7 +21,7 @@ public class MonitorSendTractionStationTaskRunner implements TimerTaskRunner { @Override - public void action() { + public void action(String date) { //牵引站 MonitorParam.Info param3 = new MonitorParam.Info(); param3.setObjType(sysDicTreePOService.queryByCode("1300").getId()); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorUserSendTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorUserSendTaskRunner.java index d76413fa7..17d47ec23 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorUserSendTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorUserSendTaskRunner.java @@ -21,7 +21,7 @@ public class MonitorUserSendTaskRunner implements TimerTaskRunner { @Override - public void action() { + public void action(String date) { //重要或敏感用户 MonitorParam.Info param2 = new MonitorParam.Info(); param2.setObjType(sysDicTreePOService.queryByCode("2400").getId()); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/OrgTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/OrgTaskRunner.java index 1480c9396..2e08067cb 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/OrgTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/OrgTaskRunner.java @@ -2,6 +2,7 @@ package com.njcn.system.timer.tasks; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient; import com.njcn.prepare.harmonic.pojo.bo.BaseParam; import com.njcn.system.timer.TimerTaskRunner; @@ -22,11 +23,15 @@ public class OrgTaskRunner implements TimerTaskRunner { private final LiteFlowFeignClient liteFlowFeignClient; @Override - public void action() { + public void action(String date) { BaseParam baseParam = new BaseParam(); baseParam.setFullChain(true); baseParam.setRepair(false); - baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + if(StrUtil.isBlank(date)){ + baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + }else { + baseParam.setDataDate(date); + } liteFlowFeignClient.orgPointExecutor(baseParam); } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsDimTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsDimTaskRunner.java index 18e4813e1..ef1914b92 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsDimTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsDimTaskRunner.java @@ -2,6 +2,7 @@ package com.njcn.system.timer.tasks; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient; import com.njcn.prepare.harmonic.pojo.bo.BaseParam; import com.njcn.system.timer.TimerTaskRunner; @@ -22,11 +23,15 @@ public class PmsDimTaskRunner implements TimerTaskRunner { private final LiteFlowFeignClient liteFlowFeignClient; @Override - public void action() { + public void action(String date) { BaseParam baseParam = new BaseParam(); baseParam.setFullChain(true); baseParam.setRepair(false); - baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + if(StrUtil.isBlank(date)){ + baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + }else { + baseParam.setDataDate(date); + } liteFlowFeignClient.pmsDimExecutor(baseParam); } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsMonitorLimitSendTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsMonitorLimitSendTaskRunner.java index a2b2669bd..39c71613e 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsMonitorLimitSendTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsMonitorLimitSendTaskRunner.java @@ -20,7 +20,7 @@ public class PmsMonitorLimitSendTaskRunner implements TimerTaskRunner { @Override - public void action() { + public void action(String date) { String code = gwMonitorPushFeignClient.pushMonitorOverLimit(new ArrayList<>()).getCode(); if(code.equals("A0002")){ throw new BusinessException("失败"); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsMonitorSendTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsMonitorSendTaskRunner.java index 6cfebea71..2c96afd4c 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsMonitorSendTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsMonitorSendTaskRunner.java @@ -23,7 +23,7 @@ public class PmsMonitorSendTaskRunner implements TimerTaskRunner { @Override - public void action() { + public void action(String date) { String code = gwMonitorPushFeignClient.timeTaskPushMonitor(new ArrayList<>()).getCode(); if(code.equals("A0002")){ throw new BusinessException("失败"); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsStatisticsSpecialMonitorTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsStatisticsSpecialMonitorTaskRunner.java index 71c95135b..c4b096f01 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsStatisticsSpecialMonitorTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsStatisticsSpecialMonitorTaskRunner.java @@ -31,7 +31,7 @@ public class PmsStatisticsSpecialMonitorTaskRunner implements TimerTaskRunner { private final PmsStatisticsSpecialMonitorFeignClient pmsStatisticsSpecialMonitorFeignClient; @Override - public void action() { + public void action(String date) { log.info(LocalDateTime.now()+"专项分析-台账统计调度开始"); LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH)); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java index d4e021a95..3f4e7f373 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java @@ -22,7 +22,7 @@ public class PqTypicalSourceTaskRunner implements TimerTaskRunner { @Override - public void action() { + public void action(String date) { UploadParam param=new UploadParam(); param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); String code = pqTypicalSourceFeignClient.send(param).getCode(); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpEmissionTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpEmissionTaskRunner.java index 2eb98d7b1..1c240b382 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpEmissionTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpEmissionTaskRunner.java @@ -31,7 +31,7 @@ public class RMpEmissionTaskRunner implements TimerTaskRunner { private final RMpEmissionFeignClient rMpEmissionFeignClient; @Override - public void action() { + public void action(String date) { log.info(LocalDateTime.now()+"发射特性调度开始"); LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH)); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpInfluenceTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpInfluenceTaskRunner.java index 0220bffd7..4a1fdb7e4 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpInfluenceTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpInfluenceTaskRunner.java @@ -31,7 +31,7 @@ public class RMpInfluenceTaskRunner implements TimerTaskRunner { private final RMpInfluenceFeignClient rMpInfluenceFeignClient; @Override - public void action() { + public void action(String date) { log.info(LocalDateTime.now()+"影响特性调度开始"); LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH)); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/StatisticReportTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/StatisticReportTaskRunner.java index c9e05ad70..9aecdb5e7 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/StatisticReportTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/StatisticReportTaskRunner.java @@ -24,7 +24,7 @@ public class StatisticReportTaskRunner implements TimerTaskRunner { private final SupvStatisticReportMFeignClient supvStatisticReportMFeignClient; @Override - public void action() { + public void action(String date) { log.info(LocalDateTime.now()+"技术监督计划问题月报统计调用成功"); LocalDate yesterday = LocalDate.now().plusDays(-1); supvStatisticReportMFeignClient.statisticReport(yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SubstationTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SubstationTaskRunner.java index 0979defd2..1bb0ec13b 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SubstationTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SubstationTaskRunner.java @@ -2,6 +2,7 @@ package com.njcn.system.timer.tasks; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient; import com.njcn.prepare.harmonic.pojo.bo.BaseParam; import com.njcn.system.timer.TimerTaskRunner; @@ -22,11 +23,15 @@ public class SubstationTaskRunner implements TimerTaskRunner { private final LiteFlowFeignClient liteFlowFeignClient; @Override - public void action() { + public void action(String date) { BaseParam baseParam = new BaseParam(); baseParam.setFullChain(true); baseParam.setRepair(false); - baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + if(StrUtil.isBlank(date)){ + baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + }else { + baseParam.setDataDate(date); + } liteFlowFeignClient.substationExecutor(baseParam); } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java index eba909ffe..5d3a5ec87 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java @@ -21,7 +21,7 @@ public class UploadGwOrgAllRunner implements TimerTaskRunner { private final LiteFlowFeignClient liteFlowFeignClient; @Override - public void action() { + public void action(String date) { BaseParam baseParam = new BaseParam(); baseParam.setFullChain(true); baseParam.setRepair(false); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationRunner.java index 6db61c6f4..f707f7ff3 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationRunner.java @@ -23,7 +23,7 @@ public class UploadGwTaskEvaluationRunner implements TimerTaskRunner { private final UploadGwDataFeignClient uploadGwDataFeignClient; @Override - public void action() { + public void action(String date) { UploadParam param = new UploadParam(); param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); String code = uploadGwDataFeignClient.uploadEvaluationData(param).getCode(); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskRunner.java index 851e58500..387a09fe0 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskRunner.java @@ -23,7 +23,7 @@ public class UploadGwTaskRunner implements TimerTaskRunner { private final UploadGwDataFeignClient uploadGwDataFeignClient; @Override - public void action() { + public void action(String date) { UploadParam param = new UploadParam(); param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); String code = uploadGwDataFeignClient.uploadPointStatisticalData(param).getCode(); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java index eb0a2acf7..995cc307b 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java @@ -23,7 +23,7 @@ public class UploadGwTaskSubstationRunner implements TimerTaskRunner { private final UploadGwDataFeignClient uploadGwDataFeignClient; @Override - public void action() { + public void action(String date) { UploadParam param = new UploadParam(); param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); String code = uploadGwDataFeignClient.uploadSubstationStatisticalData(param).getCode(); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UserLogTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UserLogTaskRunner.java index 550a138ed..d38ef572c 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UserLogTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UserLogTaskRunner.java @@ -22,7 +22,7 @@ public class UserLogTaskRunner implements TimerTaskRunner { private final AuditService auditService; @Override - public void action() { + public void action(String date) { auditService.clearHistoryLog(); } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/specialAnalysisIndexOverviewTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/specialAnalysisIndexOverviewTaskRunner.java index f51749985..98452708e 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/specialAnalysisIndexOverviewTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/specialAnalysisIndexOverviewTaskRunner.java @@ -31,7 +31,7 @@ public class specialAnalysisIndexOverviewTaskRunner implements TimerTaskRunner { private final SpecialAnalysisFeignClient specialAnalysisFeignClient; @Override - public void action() { + public void action(String date) { log.info(LocalDateTime.now()+"专项分析-指标总览开始执行"); LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH));