From 060c41380ceaff0549b5a1615fa36d6f5853d7a1 Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 18 Jun 2021 11:19:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(fix):cron=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/ScheduleService.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/ScheduleService.java b/backend/src/main/java/io/dataease/service/ScheduleService.java index af00535edf..7ef72699fc 100644 --- a/backend/src/main/java/io/dataease/service/ScheduleService.java +++ b/backend/src/main/java/io/dataease/service/ScheduleService.java @@ -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()),