From 41e69f99c564ff79b54265b9febb2f4e8684076f Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Fri, 8 Aug 2025 13:59:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=B0=8F=E6=97=B6=EF=BC=8C=E5=88=86=E9=92=9F=EF=BC=8C?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=B8=80=E5=A4=A9=E5=86=85=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exec/controller/PatrolTaskExecController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java index 720d4f8..0ed6b39 100644 --- a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java +++ b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java @@ -558,7 +558,7 @@ public class PatrolTaskExecController extends BaseController { logger.info("[TASK] {}， isInterTaskByHour exeTime: {}", task.getTaskCode(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, exeTime)); task.setFixedStartTime(exeTime); final String taskType = "INTER-BY-HOUR"; - parseTaskToRedis(taskType, task, null); + parseTaskToRedis(taskType, task, task.getIntervalEndTime()); } } else { log.info("[TASK] isInterTaskByHour intervalNumber error: {}", intervalNumber); @@ -567,13 +567,15 @@ public class PatrolTaskExecController extends BaseController { // 按分钟执行 int intervalNumber = task.getIntervalNumber(); if (intervalNumber > 0) { - List exeTimes = getExecTimesByMinute(task.getIntervalExecuteTime(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getIntervalStartTime()), DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getIntervalEndTime()), intervalNumber); + // 取当天的执行时间 + String endTime = DateUtils.format(DateUtils.YYYY_MM_DD, DateUtils.addDays(task.getIntervalStartTime(), 1)) + " 00:00:00"; + List exeTimes = getExecTimesByMinute(task.getIntervalExecuteTime(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getIntervalStartTime()), endTime, intervalNumber); if (exeTimes.size() > 0) { - Date date = exeTimes.get(exeTimes.size() - 1); +// Date date = exeTimes.get(exeTimes.size() - 1); for (Date exeTime : exeTimes) { task.setFixedStartTime(exeTime); final String taskType = "INTER-BY-MINUTE"; - parseTaskToRedis(taskType, task, date); + parseTaskToRedis(taskType, task, task.getIntervalEndTime()); } } } else { @@ -1025,7 +1027,5 @@ public class PatrolTaskExecController extends BaseController { if(fixedDay1.equals(currentDay1) && (value >= 0 && value <= 60000 && fixedDate1.before(currentDate1) || fixedDate1.getTime() == currentDate1.getTime())) { System.out.println("过期时间没超过1分钟"); } - - System.out.println(DateUtils.format(DateUtils.yyyyMMddHHmmss2, new Date())); } }