From ce96ca3988b31801d2ca5aefa5157b45e6cd3fad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Tue, 10 Mar 2026 16:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/domain/DroneReturnHomeRequest.java    | 22 +++++++++----------
 .../api/domain/DroneTakeoffRequest.java       | 14 ++++++------
 .../ruoyi/task/api/enums/TaskTypeEnum.java    |  7 +++++-
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneReturnHomeRequest.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneReturnHomeRequest.java
index 8dcd160..35c5378 100644
--- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneReturnHomeRequest.java
+++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneReturnHomeRequest.java
@@ -20,16 +20,16 @@ public class DroneReturnHomeRequest implements Serializable {
     /** 机场SN号 */
     @Schema(description = "机场SN号", example = "THJSQ03B2309DN7VQN43")
     private String sn;
+//
+//    /** 消息ID */
+//    @Schema(description = "消息ID", example = "9056")
+//    private Long messageID;
+//
+//    /** 任务ID */
+//    @Schema(description = "任务ID", example = "9074")
+//    private Long taskId;
 
-    /** 消息ID */
-    @Schema(description = "消息ID", example = "9056")
-    private Long messageID;
-
-    /** 任务ID */
-    @Schema(description = "任务ID", example = "9074")
-    private Long taskId;
-
-    /** 返航类型 */
-    @Schema(description = "返航类型", example = "03")
-    private String zhilin;
+//    /** 返航类型 */
+//    @Schema(description = "返航类型", example = "03")
+//    private String zhilin;
 }
diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneTakeoffRequest.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneTakeoffRequest.java
index 04f8fec..6bef56b 100644
--- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneTakeoffRequest.java
+++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneTakeoffRequest.java
@@ -20,14 +20,14 @@ public class DroneTakeoffRequest implements Serializable {
     /** 机场SN号 */
     @Schema(description = "机场SN号", example = "THJSQ03B2309DN7VQN43")
     private String sn;
+//
+//    /** 消息ID */
+//    @Schema(description = "消息ID", example = "9056")
+//    private Long messageID;
 
-    /** 消息ID */
-    @Schema(description = "消息ID", example = "9056")
-    private Long messageID;
-
-    /** 航线文件URL */
-    @Schema(description = "航线文件URL", example = "https://minio-jndsj.t-aaron.com:2443/th-airport/testFile/13912c62-b96f-4df5-ab65-813c8c4b04eb.waypoints")
-    private String airlineFileUrl;
+//    /** 航线文件URL */
+//    @Schema(description = "航线文件URL", example = "https://minio-jndsj.t-aaron.com:2443/th-airport/testFile/13912c62-b96f-4df5-ab65-813c8c4b04eb.waypoints")
+//    private String airlineFileUrl;
 
     /** 最低电池电量 */
     @Schema(description = "最低电池电量", example = "0.3")
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 7329a1a..b2ebdd2 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
@@ -1,5 +1,8 @@
 package com.ruoyi.task.api.enums;
 
+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", "计划任务"),
@@ -13,6 +16,7 @@ public enum TaskTypeEnum {
         this.name = name;
     }
 
+    @JsonValue
     public String getCode() {
         return code;
     }
@@ -21,6 +25,7 @@ public enum TaskTypeEnum {
         return name;
     }
 
+    @JsonCreator
     public static TaskTypeEnum getByCode(String code) {
         for (TaskTypeEnum type : values()) {
             if (type.code.equals(code)) {
@@ -29,4 +34,4 @@ public enum TaskTypeEnum {
         }
         return null;
     }
-}
\ No newline at end of file
+}