THENG
/
a-cloud-all
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: THENG:3c47e50574f574bed85c5ad4369e9ed184e3ee7e
Branches Tags
THENG:main
THENG:test
THENG:dev
THENG:f_paush
THENG:f_deploy
THENG:f_add_shuxing
..
compare: THENG:fbc35af80c3ca4a6abacbfd583720141e82de082
Branches Tags
THENG:test
THENG:dev
THENG:f_paush
THENG:f_deploy
THENG:f_add_shuxing
THENG:main

No commits in common. "3c47e50574f574bed85c5ad4369e9ed184e3ee7e" and "fbc35af80c3ca4a6abacbfd583720141e82de082" have entirely different histories.
3c47e50574 ... fbc35af80c

3 changed files with 7 additions and 16 deletions
Show Stats Expand all files Collapse all files

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

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

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

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

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

@ -4,16 +4,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
public enum TaskTypeEnum { 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 code;
private final String name; private final String name;