From 05cf5324975e6bc221c9f85489ae977962cfc988 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 3 Sep 2024 13:03:50 +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, 3 insertions(+), 6 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 4ecc54388d..4a47dd1827 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 @@ -36,18 +36,15 @@ public class DeTaskExecutor { public void init() { } - public void addThresholdTask(Long taskId, String cron, Long startTime, Long endTime) { + public void addThresholdTask(Long taskId, String cron) { String key = taskId.toString(); JobKey jobKey = new JobKey(key, THRESHOLD_JOB_GROUP); TriggerKey triggerKey = new TriggerKey(key, THRESHOLD_JOB_GROUP); JobDataMap jobDataMap = new JobDataMap(); jobDataMap.put("taskId", taskId); jobDataMap.put("threshold", taskId); - Date end = null; - if (ObjectUtils.isNotEmpty(endTime)) end = new Date(endTime); Date startDate = new Date(); - if (ObjectUtils.isNotEmpty(startTime)) startDate = new Date(startTime); - scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, DeXpackScheduleJob.class, cron, startDate, end, jobDataMap); + scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, DeXpackScheduleJob.class, cron, startDate, null, jobDataMap); } public void addOrUpdateTask(Long taskId, String cron, Long startTime, Long endTime) { diff --git a/de-xpack b/de-xpack index 2e0b320c99..2378ae36e6 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 2e0b320c998bdb2ba7962de4c73d11f69b34735c +Subproject commit 2378ae36e6b40ed9dbf0c5f7d3c6b744abb541ff