perf(X-Pack): 服务启动以及意外停止时定时报告补偿处理

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

@@ -17,6 +17,9 @@ public class DeTaskExecutor {
 
     protected static final String IS_TEMP_TASK = "isTempTask";
 
+    private static final String JOB_GROUP = "REPORT_TASK";
+    private static final String TEMP_JOB_GROUP = "TEMP_REPORT_TASK";
+
     @Resource
     private ScheduleManager scheduleManager;
 
@@ -25,13 +28,16 @@ public class DeTaskExecutor {
         return false;
     }
 
+    @XpackInteract(value = "xpackTaskExecutor", replace = true)
+    public void init() {}
+
     public void addOrUpdateTask(Long taskId, String cron, Long startTime, Long endTime) {
         if (CronUtils.taskExpire(endTime)) {
             return;
         }
         String key = taskId.toString();
-        JobKey jobKey = new JobKey(key, key);
-        TriggerKey triggerKey = new TriggerKey(key, key);
+        JobKey jobKey = new JobKey(key, JOB_GROUP);
+        TriggerKey triggerKey = new TriggerKey(key, JOB_GROUP);
         JobDataMap jobDataMap = new JobDataMap();
         jobDataMap.put("taskId", taskId);
         jobDataMap.put(IS_TEMP_TASK, false);
@@ -42,14 +48,14 @@ public class DeTaskExecutor {
 
     public void fireNow(Long taskId) throws Exception {
         String key = taskId.toString();
-        JobKey jobKey = new JobKey(key, key);
+        JobKey jobKey = new JobKey(key, JOB_GROUP);
         scheduleManager.fireNow(jobKey);
     }
 
     public void addTempTask(Long taskId, Long startTime) {
         String key = taskId.toString();
-        JobKey jobKey = new JobKey(key, key);
-        TriggerKey triggerKey = new TriggerKey(key, key);
+        JobKey jobKey = new JobKey(key, TEMP_JOB_GROUP);
+        TriggerKey triggerKey = new TriggerKey(key, TEMP_JOB_GROUP);
         JobDataMap jobDataMap = new JobDataMap();
         jobDataMap.put(IS_TEMP_TASK, true);
         String cron = CronUtils.tempCron();
@@ -57,10 +63,10 @@ public class DeTaskExecutor {
         scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, DeXpackScheduleJob.class, cron, new Date(startTime), null, jobDataMap);
     }
 
-    public void removeTask(Long taskId) {
+    public void removeTask(Long taskId, boolean isTemp) {
         String key = taskId.toString();
-        JobKey jobKey = new JobKey(key);
-        TriggerKey triggerKey = new TriggerKey(key);
+        JobKey jobKey = new JobKey(key, isTemp ? TEMP_JOB_GROUP : JOB_GROUP);
+        TriggerKey triggerKey = new TriggerKey(key, isTemp ? TEMP_JOB_GROUP : JOB_GROUP);
         scheduleManager.removeJob(jobKey, triggerKey);
     }
 }

core/core-backend/src/main/java/io/dataease/listener/XpackTaskStarter.java

@@ -0,0 +1,28 @@
+package io.dataease.listener;
+
+import io.dataease.job.schedule.DeTaskExecutor;
+import io.dataease.license.utils.LicenseUtil;
+import io.dataease.utils.LogUtil;
+import jakarta.annotation.Resource;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+@Component
+@Order(value = 4)
+public class XpackTaskStarter implements ApplicationRunner {
+
+    @Resource
+    private DeTaskExecutor deTaskExecutor;
+
+    @Override
+    public void run(ApplicationArguments args) {
+        try {
+            LicenseUtil.validate();
+            deTaskExecutor.init();
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage(), e.getCause());
+        }
+    }
+}

de-xpack

@@ -1 +1 @@
-Subproject commit 1873d99322c5d78bd08b3b13588c32f92407df3f
+Subproject commit 67876b4735f004b6e8aee79f91246f3faf4774df