From a5a1f58d30cf1a0eac513cb14d4d4d789251a43c Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Sat, 8 Mar 2025 09:54:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/timer/tasks/MeasurementHourTaskRunner.java | 9 ++++++--- .../njcn/system/timer/tasks/MeasurementTaskRunner.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementHourTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementHourTaskRunner.java index 26baaa34b..808760ede 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementHourTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementHourTaskRunner.java @@ -26,11 +26,14 @@ public class MeasurementHourTaskRunner implements TimerTaskRunner { public void action(String date) { BaseParam baseParam = new BaseParam(); baseParam.setFullChain(true); - baseParam.setRepair(false); + //由于是按小时跑的,前端其他算法都是按天跑的,因此修改参数 if(StrUtil.isBlank(date)){ - baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATETIME_PATTERN)); + baseParam.setRepair(false); + baseParam.setDataDate(DateUtil.now()); }else { - baseParam.setDataDate(date); + baseParam.setRepair(true); + baseParam.setDataDate(date+ "00:00:00"); + baseParam.setDataDate(date+ "23:59:59"); } liteFlowFeignClient.measurementPointExecutorByHour(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 9e93dd792..26bacfdcd 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 @@ -28,7 +28,7 @@ public class MeasurementTaskRunner implements TimerTaskRunner { baseParam.setFullChain(true); baseParam.setRepair(false); if(StrUtil.isBlank(date)){ - baseParam.setDataDate(DateUtil.now()); + baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATETIME_PATTERN)); }else { baseParam.setDataDate(date); }