feat(fix):定时任务修复

backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java

@@ -2,13 +2,13 @@ package io.dataease.job.sechedule;
 
 import io.dataease.commons.utils.LogUtil;
 import org.quartz.*;
-import org.quartz.impl.triggers.CronTriggerImpl;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class ScheduleManager {
@@ -84,6 +84,8 @@ public class ScheduleManager {
                 } else {
                     triggerBuilder.endAt(endTime);
                 }
+            } else {
+                triggerBuilder.endAt(null);
             }
 
             triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron));
@@ -167,6 +169,8 @@ public class ScheduleManager {
                 } else {
                     triggerBuilder.endAt(endTime);
                 }
+            } else {
+                triggerBuilder.endAt(null);
             }
 
             triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron));// 触发器时间设定

backend/src/main/java/io/dataease/listener/AppStartListener.java

@@ -26,7 +26,13 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
         List<DatasetTableTask> list = dataSetTableTaskService.list(new DatasetTableTask());
         for (DatasetTableTask task : list) {
             try {
-                scheduleService.addSchedule(task);
+                if (task.getEndTime() != null && task.getEndTime() > 0) {
+                    if (task.getEndTime() > System.currentTimeMillis()) {
+                        scheduleService.addSchedule(task);
+                    }
+                } else {
+                    scheduleService.addSchedule(task);
+                }
             } catch (Exception e) {
                 e.printStackTrace();
             }

backend/src/main/java/io/dataease/service/ScheduleService.java

@@ -37,6 +37,10 @@ public class ScheduleService {
 //                if (endTime.before(new Date())) {
 //                    return;
 //                }
+                if (endTime.before(new Date())) {
+                    deleteSchedule(datasetTableTask);
+                    return;
+                }
             }
 
             scheduleManager.addOrUpdateCronJob(new JobKey(datasetTableTask.getId(), datasetTableTask.getTableId()),