Merge branch 'main' of http://th.local.t-aaron.com:13000/THENG/a-cloud-all

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/PlanTypeEnum.java

@@ -2,7 +2,8 @@ package com.ruoyi.task.api.enums;
 
 public enum PlanTypeEnum {
     TIMED("timed", "定时任务"),
-    CYCLE("cycle", "周期任务");
+    CYCLE("cycle", "周期任务"),
+    IMMEDIATELY("immediately", "立即任务");
 
     private final String code;
     private final String name;

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/TaskCategoryEnum.java

@@ -4,9 +4,10 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
 public enum TaskCategoryEnum {
-    MANUAL_FLIGHT("manual_flight", "人工执飞"),
+    NORMAL("NORMAL", "普通"),
-    PLAN_TASK("plan_task", "计划任务"),
+    MANUAL("MANUAL", "人工"),
-    EMERGENCY_TASK("emergency_task", "紧急任务");
+    MANY("MANY", "多机"),
+    JUMP("JUMP", "蛙跳");
 
     private final String code;
     private final String name;

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/TaskTypeEnum.java

@@ -4,9 +4,16 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
 public enum TaskTypeEnum {
-    ONE_CLICK_TAKE_OFF("one_click_take_off", "一键起飞"),
+    /**
-    PLAN_TASK("plan_task", "计划任务"),
+     * 普通任务子类
-    MANUAL_FLIGHT("manual_flight", "人工执飞");
+     */
+    TIMED("TIMED", "定时任务"),
+    CYCLE("CYCLE", "周期任务"),
+    IMMEDIATELY("IMMEDIATELY", "立即任务"),
+    /**
+     * MANUAL类型下
+     */
+    ONE_CLICK("ONE_CLICK", "一键起飞");
 
     private final String code;
     private final String name;