From f7f43b5daba00df0d0b74c55dc45b90381a45a48 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Mon, 6 Feb 2023 11:33:16 +0800
Subject: [PATCH] [ server ] [ scheduler ]-  script scheduler update -1

---
 .../service/QuartzSchedulerService.java       | 46 +++++++++++++++----
 .../service/QuartzSchedulerServiceImpl.java   | 17 ++++++-
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerService.java b/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerService.java
index 55b3552..e45e20c 100644
--- a/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerService.java
+++ b/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerService.java
@@ -18,12 +18,13 @@ public interface QuartzSchedulerService {
 
     /**
      * 增加一个任务job
-     * @param jobClass  任务job实现类
-     * @param jobName   任务job名称（保证唯一性）
-     * @param jobGroupName  任务job组名
+     *
+     * @param jobClass          任务job实现类
+     * @param jobName           任务job名称（保证唯一性）
+     * @param jobGroupName      任务job组名
      * @param jobRunTimePinch   任务时间间隔（秒）
-     * @param jobRunRepeatTimes  任务运行次数（若<0，则不限次数）
-     * @param jobData   任务参数
+     * @param jobRunRepeatTimes 任务运行次数（若<0，则不限次数）
+     * @param jobData           任务参数
      */
     void addMission(Class<? extends QuartzJobBean> jobClass, String jobName, String jobGroupName, int jobRunTimePinch, int jobRunRepeatTimes, Map jobData);
 
@@ -39,11 +40,32 @@ public interface QuartzSchedulerService {
      */
     void addMission(Class<? extends QuartzJobBean> jobClass, String jobName, String jobGroupName, int startTime, String cronJobExpression, Map jobData);
 
+    /**
+     * 增加一个任务job
+     *
+     * @param jobClass          任务job实现类
+     * @param jobName           任务job名称（保证唯一性）
+     * @param jobGroupName      任务job组名
+     * @param startTime
+     * @param cronJobExpression 任务时间表达式
+     * @param jobData           任务参数
+     */
+    void addMission(
+            Class<? extends QuartzJobBean> jobClass,
+            String jobName,
+            String jobGroupName,
+            String jobDescription,
+            int startTime,
+            String cronJobExpression,
+            Map jobData
+    );
+
     /**
      * 修改一个任务job
-     * @param jobName 任务名称
-     * @param jobGroupName  任务组名
-     * @param jobTime   cron时间表达式
+     *
+     * @param jobName      任务名称
+     * @param jobGroupName 任务组名
+     * @param jobTime      cron时间表达式
      */
     void updateMission(String jobName, String jobGroupName, String jobTime);
 
@@ -59,6 +81,7 @@ public interface QuartzSchedulerService {
 
     /**
      * 暂停一个任务job
+     *
      * @param jobName
      * @param jobGroupName
      */
@@ -66,6 +89,7 @@ public interface QuartzSchedulerService {
 
     /**
      * 恢复一个任务job
+     *
      * @param jobName
      * @param jobGroupName
      */
@@ -73,6 +97,7 @@ public interface QuartzSchedulerService {
 
     /**
      * 立即执行一个任务job
+     *
      * @param jobName
      * @param jobGroupName
      */
@@ -80,6 +105,7 @@ public interface QuartzSchedulerService {
 
     /**
      * 获取所有任务job
+     *
      * @return
      */
     List<Map<String, Object>> queryAllMission();
@@ -94,6 +120,7 @@ public interface QuartzSchedulerService {
 
     /**
      * 获取正在运行的任务job
+     *
      * @return
      */
     List<Map<String, Object>> queryRunMission();
@@ -101,8 +128,7 @@ public interface QuartzSchedulerService {
 
     /**
      * 获取所有的触发器
-     *
-     * */
+     */
     List<Trigger> queryAllTrigger();
 
 
diff --git a/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerServiceImpl.java b/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerServiceImpl.java
index c79ec70..93bc59e 100644
--- a/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerServiceImpl.java
+++ b/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerServiceImpl.java
@@ -72,8 +72,9 @@ public class QuartzSchedulerServiceImpl implements QuartzSchedulerService {
         );
         this.addMission(
                 AgentScriptSchedulerJob.class,
-                scriptSchedulerDTO.getSchedulerUuid(),
+                scriptSchedulerDTO.getName(),
                 SCRIPT_SCHEDULE_MISSION_GROUP_NAME,
+                scriptSchedulerDTO.getDescription(),
                 0,
                 // 立即开始本次任务 1ms wait
                 scriptSchedulerDTO.getCronExpress(),
@@ -270,6 +271,19 @@ public class QuartzSchedulerServiceImpl implements QuartzSchedulerService {
      */
     @Override
     public void addMission(Class<? extends QuartzJobBean> jobClass, String jobName, String jobGroupName, int startTime, String cronJobExpression, Map jobData) {
+        addMission(
+                jobClass,
+                jobName,
+                jobGroupName,
+                null,
+                startTime,
+                cronJobExpression,
+                jobData
+        );
+    }
+
+    @Override
+    public void addMission(Class<? extends QuartzJobBean> jobClass, String jobName, String jobGroupName, String jobDescription, int startTime, String cronJobExpression, Map jobData) {
         try {
             // 创建jobDetail实例，绑定Job实现类
             // 指明job的名称，所在组的名称，以及绑定job类
@@ -280,6 +294,7 @@ public class QuartzSchedulerServiceImpl implements QuartzSchedulerService {
                             jobName,
                             jobGroupName
                     )
+                    .withDescription(jobDescription)
                     .build();
             // 设置job参数
             if (jobData != null && jobData.size() > 0) {