diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/ExecuteTypeEnum.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/ExecuteTypeEnum.java index 69365a3..0e66a14 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/ExecuteTypeEnum.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/ExecuteTypeEnum.java @@ -1,5 +1,8 @@ package com.ruoyi.task.api.enums; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + public enum ExecuteTypeEnum { ONCE("once", "单次执行"), CONTINUOUS("continuous", "连续执行"); @@ -12,6 +15,7 @@ public enum ExecuteTypeEnum { this.name = name; } + @JsonValue public String getCode() { return code; } @@ -20,12 +24,16 @@ public enum ExecuteTypeEnum { return name; } - public static ExecuteTypeEnum getByCode(String code) { + @JsonCreator + public static ExecuteTypeEnum getByCode(String value) { + if (value == null || value.isEmpty()) { + return null; + } for (ExecuteTypeEnum type : values()) { - if (type.code.equals(code)) { + if (type.code.equals(value) || type.name().equals(value)) { return type; } } return null; } -} \ No newline at end of file +} diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/StatusEnum.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/StatusEnum.java index 2873ea3..17f9c12 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/StatusEnum.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/StatusEnum.java @@ -1,5 +1,8 @@ package com.ruoyi.task.api.enums; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + public enum StatusEnum { PENDING("pending", "待执行"), RUNNING("running", "执行中"), @@ -15,6 +18,7 @@ public enum StatusEnum { this.name = name; } + @JsonValue public String getCode() { return code; } @@ -23,12 +27,16 @@ public enum StatusEnum { return name; } - public static StatusEnum getByCode(String code) { + @JsonCreator + public static StatusEnum getByCode(String value) { + if (value == null || value.isEmpty()) { + return null; + } for (StatusEnum status : values()) { - if (status.code.equals(code)) { + if (status.code.equals(value) || status.name().equals(value)) { return status; } } return null; } -} \ No newline at end of file +} diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/TaskCategoryEnum.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/TaskCategoryEnum.java index 2a4fcba..1af25ab 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/TaskCategoryEnum.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/TaskCategoryEnum.java @@ -1,5 +1,8 @@ package com.ruoyi.task.api.enums; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + public enum TaskCategoryEnum { MANUAL_FLIGHT("manual_flight", "人工执飞"), PLAN_TASK("plan_task", "计划任务"), @@ -13,6 +16,7 @@ public enum TaskCategoryEnum { this.name = name; } + @JsonValue public String getCode() { return code; } @@ -21,12 +25,16 @@ public enum TaskCategoryEnum { return name; } - public static TaskCategoryEnum getByCode(String code) { + @JsonCreator + public static TaskCategoryEnum getByCode(String value) { + if (value == null || value.isEmpty()) { + return null; + } for (TaskCategoryEnum category : values()) { - if (category.code.equals(code)) { + if (category.code.equals(value) || category.name().equals(value)) { return category; } } return null; } -} \ No newline at end of file +} diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/TaskTypeEnum.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/TaskTypeEnum.java index b2ebdd2..d03297f 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/TaskTypeEnum.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/TaskTypeEnum.java @@ -26,9 +26,12 @@ public enum TaskTypeEnum { } @JsonCreator - public static TaskTypeEnum getByCode(String code) { + public static TaskTypeEnum getByCode(String value) { + if (value == null || value.isEmpty()) { + return null; + } for (TaskTypeEnum type : values()) { - if (type.code.equals(code)) { + if (type.code.equals(value) || type.name().equals(value)) { return type; } }