public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-17 21:08:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:dataease/dataease into main

Browse Source
This commit is contained in:
taojinlong
2021-06-03 12:17:19 +08:00
parent 018b657f1a 01bd2b165c
commit 9d142bcfc8
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java
View File

@@ -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));// 触发器时间设定