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

Merge pull request #12807 from ulleo/dev-v2

Browse Source 
feat(X-Pack): 调整数据填报下发任务日志
This commit is contained in:
ulleo 2024-10-21 15:47:15 +08:00 committed by GitHub
commit 18fd44b69d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/core-backend/src/main/java/io/dataease/job/schedule/DeXpackDataFillingScheduleJob.java
View File

@ -2,6 +2,7 @@ package io.dataease.job.schedule;
import io.dataease.license.utils.LicenseUtil;
import io.dataease.utils.CommonBeanFactory;
import io.dataease.utils.LogUtil;
import org.quartz.*;
import org.springframework.stereotype.Component;
@ -18,10 +19,14 @@ public class DeXpackDataFillingScheduleJob implements Job {
JobDataMap jobDataMap = jobExecutionContext.getJobDetail().getJobDataMap();
DeDataFillingTaskExecutor deTaskExecutor = CommonBeanFactory.getBean(DeDataFillingTaskExecutor.class);
assert deTaskExecutor != null;
LicenseUtil.validate();
boolean taskLoaded = deTaskExecutor.execute(jobDataMap);
if (!taskLoaded) {
Objects.requireNonNull(CommonBeanFactory.getBean(ScheduleManager.class)).removeJob(jobKey, trigger.getKey());
try {
LicenseUtil.validate();
boolean taskLoaded = deTaskExecutor.execute(jobDataMap);
if (!taskLoaded) {
Objects.requireNonNull(CommonBeanFactory.getBean(ScheduleManager.class)).removeJob(jobKey, trigger.getKey());
}
} catch (Exception e) {
LogUtil.error(e.getMessage(), e.getCause());
}
}
}

2
de-xpack

@ -1 +1 @@
Subproject commit 5c5f302b178affd3c301efb48df66ce1ceb0de57
Subproject commit 61d379a73420e736d18e44f2cc3b1d196baca7f3