github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #11558 from dataease/pr@dev-v2@perf_threshold_task

Browse Source 
perf(X-Pack): 阈值告警任务
This commit is contained in:
fit2cloud-chenyw 2024-08-14 17:16:05 +08:00 committed by GitHub
commit 3d7c2cbce0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/core-backend/src/main/java/io/dataease/job/schedule/DeTaskExecutor.java
View File

@ -44,11 +44,10 @@ public class DeTaskExecutor {
jobDataMap.put("taskId", taskId); jobDataMap.put("taskId", taskId);
jobDataMap.put("threshold", taskId); jobDataMap.put("threshold", taskId);
Date end = null; Date end = null;
if (CronUtils.taskExpire(endTime)) {
return;
}
if (ObjectUtils.isNotEmpty(endTime)) end = new Date(endTime); 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) { public void addOrUpdateTask(Long taskId, String cron, Long startTime, Long endTime) {

2
de-xpack

@ -1 +1 @@
Subproject commit df7b2f925448c96d4562fd48a1a3bc008b5ab5cd Subproject commit 7b8dadc5e8fc8b99dc3840ea2f9dbf441d2c21a5