public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-18 09:48:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(fix):cron修复

Browse Source
This commit is contained in:
junjie
2021-06-18 11:19:55 +08:00
parent 8aaf2aa0b6
commit 060c41380c
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/main/java/io/dataease/service/ScheduleService.java
View File

@@ -30,17 +30,21 @@ public class ScheduleService {
scheduleManager.getDefaultJobDataMap(datasetTableTask.getTableId(), datasetTableTask.getCron(), datasetTableTask.getId(), datasetTableTask.getType()));
} else if (StringUtils.equalsIgnoreCase(datasetTableTask.getRate(), ScheduleType.CRON.toString())) {
Date endTime;
if (datasetTableTask.getEndTime() == null || datasetTableTask.getEndTime() == 0) {
endTime = null;
} else {
endTime = new Date(datasetTableTask.getEndTime());
if (StringUtils.equalsIgnoreCase(datasetTableTask.getEnd(), "1")) {
if (datasetTableTask.getEndTime() == null || datasetTableTask.getEndTime() == 0) {
endTime = null;
} else {
endTime = new Date(datasetTableTask.getEndTime());
// if (endTime.before(new Date())) {
// return;
// }
if (endTime.before(new Date())) {
deleteSchedule(datasetTableTask);
return;
if (endTime.before(new Date())) {
deleteSchedule(datasetTableTask);
return;
}
}
} else {
endTime = null;
}
scheduleManager.addOrUpdateCronJob(new JobKey(datasetTableTask.getId(), datasetTableTask.getTableId()),