center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests 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
Show Stats 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())); scheduleManager.getDefaultJobDataMap(datasetTableTask.getTableId(), datasetTableTask.getCron(), datasetTableTask.getId(), datasetTableTask.getType()));
} else if (StringUtils.equalsIgnoreCase(datasetTableTask.getRate(), ScheduleType.CRON.toString())) { } else if (StringUtils.equalsIgnoreCase(datasetTableTask.getRate(), ScheduleType.CRON.toString())) {
Date endTime; Date endTime;
if (datasetTableTask.getEndTime() == null || datasetTableTask.getEndTime() == 0) { if (StringUtils.equalsIgnoreCase(datasetTableTask.getEnd(), "1")) {
endTime = null; if (datasetTableTask.getEndTime() == null || datasetTableTask.getEndTime() == 0) {
} else { endTime = null;
endTime = new Date(datasetTableTask.getEndTime()); } else {
endTime = new Date(datasetTableTask.getEndTime());
// if (endTime.before(new Date())) { // if (endTime.before(new Date())) {
// return; // return;
// } // }
if (endTime.before(new Date())) { if (endTime.before(new Date())) {
deleteSchedule(datasetTableTask); deleteSchedule(datasetTableTask);
return; return;
}
} }
} else {
endTime = null;
} }
scheduleManager.addOrUpdateCronJob(new JobKey(datasetTableTask.getId(), datasetTableTask.getTableId()), scheduleManager.addOrUpdateCronJob(new JobKey(datasetTableTask.getId(), datasetTableTask.getTableId()),