center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #11270 from dataease/pr@dev-v2@perf_report

Browse Source 
perf(X-Pack): 定时报告-失败重试禁止重复生成截图
This commit is contained in:
fit2cloud-chenyw 2024-07-30 16:52:14 +08:00 committed by GitHub
commit fc92aa6e83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ public class DeTaskExecutor {
scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, DeXpackScheduleJob.class, cron, new Date(startTime), end, jobDataMap);
}
public void addRetryTask(Long taskId, Integer retryLimit, Integer retryInterval) {
public void addRetryTask(Long taskId, Integer retryLimit, Integer retryInterval, Object retryParam) {
long saltTime = 3000L;
long interval = retryInterval == null ? 5L : retryInterval;
long intervalMill = interval * 60000L;
@ -65,6 +65,7 @@ public class DeTaskExecutor {
JobDataMap jobDataMap = new JobDataMap();
jobDataMap.put("taskId", taskId);
jobDataMap.put(IS_RETRY_TASK, true);
jobDataMap.put("retryParam", retryParam);
Date end = null;
if (ObjectUtils.isNotEmpty(endTime)) end = new Date(endTime);
scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, DeXpackScheduleJob.class, cron, new Date(now), end, jobDataMap);

2
de-xpack

@ -1 +1 @@
Subproject commit a166443c5df60215573af63186b96638cfaf8008
Subproject commit 4ff66b0edcbaee440b370dc6054500982300b9b1