From 01bd2b165c2336334954613c1968bb57e39f3de3 Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 3 Jun 2021 12:04:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(fix):=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/sechedule/ScheduleManager.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java index 562561dcb2..1521cb2346 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java +++ b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java @@ -73,12 +73,17 @@ public class ScheduleManager { triggerBuilder.withIdentity(triggerKey); + Date nTimeByCron = getNTimeByCron(cron); if (startTime.before(new Date())) { - triggerBuilder.startAt(getNTimeByCron(cron)); + triggerBuilder.startAt(nTimeByCron); } if (endTime != null) { - triggerBuilder.endAt(endTime); + if (endTime.before(nTimeByCron)) { + triggerBuilder.endAt(nTimeByCron); + } else { + triggerBuilder.endAt(endTime); + } } triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron)); @@ -151,12 +156,17 @@ public class ScheduleManager { triggerBuilder.withIdentity(triggerKey);// 触发器名,触发器组 + Date nTimeByCron = getNTimeByCron(cron); if (startTime.before(new Date())) { - triggerBuilder.startAt(getNTimeByCron(cron)); + triggerBuilder.startAt(nTimeByCron); } if (endTime != null) { - triggerBuilder.endAt(endTime); + if (endTime.before(nTimeByCron)) { + triggerBuilder.endAt(nTimeByCron); + } else { + triggerBuilder.endAt(endTime); + } } triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron));// 触发器时间设定