From d153ed978010774675ccbcd8834277145a83ea1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 12 Mar 2026 09:10:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A0=E4=BA=BA?= =?UTF-8?q?=E6=9C=BASN=E5=8F=B7=20snNumber?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java index 89959c2..04aafca 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java @@ -90,4 +90,7 @@ public class DockWithGPSVO implements Serializable { @Schema(description = "充放电状态") private String chargingStatus; + @Schema(description = "无人机SN号") + private String snNumber; + } From 174bedac0893c511bf5cbea4649a4a8ced35217c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 12 Mar 2026 13:10:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/task/api/enums/ExecuteTypeEnum.java | 14 +++++++++++--- .../java/com/ruoyi/task/api/enums/StatusEnum.java | 14 +++++++++++--- .../com/ruoyi/task/api/enums/TaskCategoryEnum.java | 14 +++++++++++--- .../com/ruoyi/task/api/enums/TaskTypeEnum.java | 7 +++++-- 4 files changed, 38 insertions(+), 11 deletions(-) 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; } }