feat(backend): Quartz框架初步实现

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

@@ -1,16 +1,22 @@
 package io.dataease.listener;
 
+import io.dataease.base.domain.DatasetTableTask;
 import io.dataease.job.sechedule.ScheduleManager;
+import io.dataease.service.ScheduleService;
+import io.dataease.service.dataset.DataSetTableTaskService;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Component
 public class AppStartListener implements ApplicationListener<ApplicationReadyEvent> {
     @Resource
-    private ScheduleManager scheduleManager;
+    private ScheduleService scheduleService;
+    @Resource
+    private DataSetTableTaskService dataSetTableTaskService;
 
     @Override
     public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
@@ -21,6 +27,14 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
 //        long timestamp = System.currentTimeMillis() + 90 * 1000;
 //        Date date = new Date(timestamp);
 //        scheduleManager.addSingleJob(new JobKey("abc", "def"), new TriggerKey("abc", "def"), TestJob.class, date);
-        // TODO 项目启动，从数据库读取任务加入到Quartz
+        // 项目启动，从数据库读取任务加入到Quartz
+        List<DatasetTableTask> list = dataSetTableTaskService.list(new DatasetTableTask());
+        for (DatasetTableTask task : list) {
+            try {
+                scheduleService.addSchedule(task);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
     }
 }

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

@@ -0,0 +1,47 @@
+package io.dataease.service;
+
+import io.dataease.base.domain.DatasetTableTask;
+import io.dataease.job.sechedule.ScheduleManager;
+import io.dataease.job.sechedule.TestJob;
+import org.apache.commons.lang3.StringUtils;
+import org.quartz.JobKey;
+import org.quartz.TriggerKey;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * @Author gin
+ * @Date 2021/3/5 2:38 下午
+ */
+@Service
+public class ScheduleService {
+    @Resource
+    private ScheduleManager scheduleManager;
+
+    public void addSchedule(DatasetTableTask datasetTableTask) throws Exception {
+        if (StringUtils.equalsIgnoreCase(datasetTableTask.getRate(), "0")) {
+            scheduleManager.addOrUpdateSingleJob(new JobKey(datasetTableTask.getId(), datasetTableTask.getTableId()),
+                    new TriggerKey(datasetTableTask.getId(), datasetTableTask.getTableId()),
+                    TestJob.class,//TODO
+                    new Date(datasetTableTask.getStartTime()));
+        } else if (StringUtils.equalsIgnoreCase(datasetTableTask.getRate(), "1")) {
+            Date endTime;
+            if (datasetTableTask.getEndTime() == null || datasetTableTask.getEndTime() == 0) {
+                endTime = null;
+            } else {
+                endTime = new Date(datasetTableTask.getEndTime());
+            }
+
+            scheduleManager.addOrUpdateCronJob(new JobKey(datasetTableTask.getId(), datasetTableTask.getTableId()),
+                    new TriggerKey(datasetTableTask.getId(), datasetTableTask.getTableId()),
+                    TestJob.class,// TODO
+                    datasetTableTask.getCron(), new Date(datasetTableTask.getStartTime()), endTime);
+        }
+    }
+
+    public void deleteSchedule(DatasetTableTask datasetTableTask) {
+        scheduleManager.removeJob(new JobKey(datasetTableTask.getId(), datasetTableTask.getTableId()), new TriggerKey(datasetTableTask.getId(), datasetTableTask.getTableId()));
+    }
+}

backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java

@@ -3,15 +3,11 @@ package io.dataease.service.dataset;
 import io.dataease.base.domain.DatasetTableTask;
 import io.dataease.base.domain.DatasetTableTaskExample;
 import io.dataease.base.mapper.DatasetTableTaskMapper;
-import io.dataease.job.sechedule.ScheduleManager;
+import io.dataease.service.ScheduleService;
-import io.dataease.job.sechedule.TestJob;
 import org.apache.commons.lang3.StringUtils;
-import org.quartz.JobKey;
-import org.quartz.TriggerKey;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
@@ -25,7 +21,7 @@ public class DataSetTableTaskService {
     private DatasetTableTaskMapper datasetTableTaskMapper;
 
     @Resource
-    private ScheduleManager scheduleManager;
+    private ScheduleService scheduleService;
 
     public DatasetTableTask save(DatasetTableTask datasetTableTask) throws Exception {
         if (StringUtils.isEmpty(datasetTableTask.getId())) {
@@ -35,32 +31,14 @@ public class DataSetTableTaskService {
         } else {
             datasetTableTaskMapper.updateByPrimaryKey(datasetTableTask);
         }
-
+        scheduleService.addSchedule(datasetTableTask);
-        if (StringUtils.equalsIgnoreCase(datasetTableTask.getRate(), "0")) {
-            scheduleManager.addOrUpdateSingleJob(new JobKey(datasetTableTask.getId(), datasetTableTask.getTableId()),
-                    new TriggerKey(datasetTableTask.getId(), datasetTableTask.getTableId()),
-                    TestJob.class,
-                    new Date(datasetTableTask.getStartTime()));
-        } else if (StringUtils.equalsIgnoreCase(datasetTableTask.getRate(), "1")) {
-            Date endTime;
-            if (datasetTableTask.getEndTime() == null || datasetTableTask.getEndTime() == 0) {
-                endTime = null;
-            } else {
-                endTime = new Date(datasetTableTask.getEndTime());
-            }
-
-            scheduleManager.addOrUpdateCronJob(new JobKey(datasetTableTask.getId(), datasetTableTask.getTableId()),
-                    new TriggerKey(datasetTableTask.getId(), datasetTableTask.getTableId()),
-                    TestJob.class,
-                    datasetTableTask.getCron(), new Date(datasetTableTask.getStartTime()), endTime);
-        }
         return datasetTableTask;
     }
 
     public void delete(String id) {
         DatasetTableTask datasetTableTask = datasetTableTaskMapper.selectByPrimaryKey(id);
         datasetTableTaskMapper.deleteByPrimaryKey(id);
-        scheduleManager.removeJob(new JobKey(datasetTableTask.getId(), datasetTableTask.getTableId()), new TriggerKey(datasetTableTask.getId(), datasetTableTask.getTableId()));
+        scheduleService.deleteSchedule(datasetTableTask);
     }
 
     public List<DatasetTableTask> list(DatasetTableTask datasetTableTask) {