From 70fb9d4b9b9dc209eb8f17df3ded31289c53b0ee Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Tue, 17 Jan 2023 11:09:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=85=B3=E9=94=AE=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mdd/admin/config/quartz/QuartzUtils.java  | 2 +-
 .../java/com/mdd/admin/service/impl/CrontabServiceImpl.java | 6 +++---
 .../src/main/java/com/mdd/common/entity/Crontab.java        | 2 +-
 sql/install.sql                                             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/quartz/QuartzUtils.java b/server/like-admin/src/main/java/com/mdd/admin/config/quartz/QuartzUtils.java
index 494971e2..98b14815 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/config/quartz/QuartzUtils.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/config/quartz/QuartzUtils.java
@@ -53,7 +53,7 @@ public class QuartzUtils {
      */
     public static void createScheduleJob(Scheduler scheduler, Crontab job) throws SchedulerException {
         Integer jobId     = job.getId();
-        String jobGroup   = job.getGroups();
+        String jobGroup   = job.getTypes();
         String expression = job.getRules();
 
         // 构建任务
diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java
index 21cbf6a6..ec5efe6a 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java
@@ -115,7 +115,7 @@ public class CrontabServiceImpl implements ICrontabService {
     public void add(CrontabCreateValidate createValidate) throws SchedulerException {
         Crontab crontab = new Crontab();
         crontab.setName(createValidate.getName());
-        crontab.setGroups(createValidate.getGroups());
+        crontab.setTypes(createValidate.getGroups());
         crontab.setCommand(createValidate.getCommand());
         crontab.setRules(createValidate.getRules());
         crontab.setStatus(createValidate.getStatus());
@@ -148,7 +148,7 @@ public class CrontabServiceImpl implements ICrontabService {
 
         crontab.setName(updateValidate.getName());
         crontab.setCommand(updateValidate.getCommand());
-        crontab.setGroups(updateValidate.getGroups());
+        crontab.setTypes(updateValidate.getGroups());
         crontab.setRules(updateValidate.getRules());
         crontab.setStatus(updateValidate.getStatus());
         crontab.setRemark(updateValidate.getRemark());
@@ -181,7 +181,7 @@ public class CrontabServiceImpl implements ICrontabService {
         crontab.setDeleteTime(System.currentTimeMillis() / 1000);
         crontabMapper.updateById(crontab);
 
-        scheduler.deleteJob(QuartzUtils.getJobKey(crontab.getId(), crontab.getGroups()));
+        scheduler.deleteJob(QuartzUtils.getJobKey(crontab.getId(), crontab.getTypes()));
     }
 
 }
diff --git a/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java b/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java
index 6b111bf0..e706e656 100644
--- a/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java
+++ b/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java
@@ -17,7 +17,7 @@ public class Crontab implements Serializable {
     @TableId(value="id", type= IdType.AUTO)
     private Integer id;         // 主键
     private String name;        // 任务名称
-    private String groups;      // 任务分组
+    private String types;      // 任务分组
     private String command;     // 执行命令
     private String rules;       // 执行规则
     private String remark;      // 备注信息
diff --git a/sql/install.sql b/sql/install.sql
index fdf3b5aa..214b2e19 100644
--- a/sql/install.sql
+++ b/sql/install.sql
@@ -503,7 +503,7 @@ DROP TABLE IF EXISTS `la_crontab`;
 CREATE TABLE `la_crontab`  (
   `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务名称',
-  `groups` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务分组',
+  `types` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务分组',
   `command` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务命令',
   `rules` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务贵州',
   `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注信息',