From 8570118226678fc36a0ea773c5220d279e532edf Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 14 Aug 2024 17:13:42 +0800 Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E9=98=88=E5=80=BC=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/job/schedule/DeTaskExecutor.java | 7 +++---- de-xpack | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/DeTaskExecutor.java b/core/core-backend/src/main/java/io/dataease/job/schedule/DeTaskExecutor.java index e21805ac38..4ecc54388d 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/DeTaskExecutor.java +++ b/core/core-backend/src/main/java/io/dataease/job/schedule/DeTaskExecutor.java @@ -44,11 +44,10 @@ public class DeTaskExecutor { jobDataMap.put("taskId", taskId); jobDataMap.put("threshold", taskId); Date end = null; - if (CronUtils.taskExpire(endTime)) { - return; - } if (ObjectUtils.isNotEmpty(endTime)) end = new Date(endTime); - scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, DeXpackScheduleJob.class, cron, new Date(startTime), end, jobDataMap); + Date startDate = new Date(); + if (ObjectUtils.isNotEmpty(startTime)) startDate = new Date(startTime); + scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, DeXpackScheduleJob.class, cron, startDate, end, jobDataMap); } public void addOrUpdateTask(Long taskId, String cron, Long startTime, Long endTime) { diff --git a/de-xpack b/de-xpack index 72d0d127c7..7b8dadc5e8 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 72d0d127c79f5252a96f0f7754a89be6fbba3e01 +Subproject commit 7b8dadc5e8fc8b99dc3840ea2f9dbf441d2c21a5