From 628efcb0b44b320150088ee706712ea38629e3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Wed, 4 Mar 2026 15:09:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A7=E5=88=B6=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/domain/DroneFlightControlRequest.java | 20 +++++++++++++++++--
 .../device/api/enums/DroneCommandEnum.java    | 17 +++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneFlightControlRequest.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneFlightControlRequest.java
index 0414226..7e1d8fe 100644
--- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneFlightControlRequest.java
+++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneFlightControlRequest.java
@@ -28,8 +28,8 @@ public class DroneFlightControlRequest implements Serializable {
     private Long taskId;
 
     /** 飞控命令 */
-    @Schema(description = "飞控命令: FORWARD-前进, BACKWARD-后退, LEFT-左移, RIGHT-右移, ROTATE_LEFT-左旋, ROTATE_RIGHT-右旋, UP-上升, DOWN-下降, RETURN_HOME-返航, EMERGENCY_STOP-急停",
-            allowableValues = {"FORWARD", "BACKWARD", "LEFT", "RIGHT", "ROTATE_LEFT", "ROTATE_RIGHT", "UP", "DOWN", "RETURN_HOME", "EMERGENCY_STOP"},
+    @Schema(description = "飞控命令: FORWARD-前进, BACKWARD-后退, LEFT-左移, RIGHT-右移, ROTATE_LEFT-左旋, ROTATE_RIGHT-右旋, UP-上升, DOWN-下降, RETURN_HOME-返航, EMERGENCY_STOP-急停, AIRLINE_FLIGHT-航线飞行, HOVER-悬停, CONTINUE_TASK-继续任务",
+            allowableValues = {"FORWARD", "BACKWARD", "LEFT", "RIGHT", "ROTATE_LEFT", "ROTATE_RIGHT", "UP", "DOWN", "RETURN_HOME", "EMERGENCY_STOP", "AIRLINE_FLIGHT", "HOVER", "CONTINUE_TASK"},
             example = "FORWARD")
     private DroneCommandEnum command;
 
@@ -59,4 +59,20 @@ public class DroneFlightControlRequest implements Serializable {
     /** 灯光模式（用于相机控制） */
     @Schema(description = "灯光模式（用于相机控制）", example = "visibleLight")
     private String lightMode;
+
+    /** 航线文件URL（用于航线飞行） */
+    @Schema(description = "航线文件URL（用于航线飞行）", example = "https://minio-jndsj.t-aaron.com:2443/th-airport/testFile/55e8cc5b-d145-43ff-9386-8daabcb5b816.waypoints")
+    private String airlineFileUrl;
+
+    /** 最低飞行电池电量（用于航线飞行） */
+    @Schema(description = "最低飞行电池电量（用于航线飞行）", example = "0.3")
+    private Double flyBatteryMin;
+
+    /** 是否必须飞行（用于航线飞行） */
+    @Schema(description = "是否必须飞行（用于航线飞行）", example = "0")
+    private Integer isMustFly;
+
+    /** 指令类型（用于悬停和继续任务） */
+    @Schema(description = "指令类型（用于悬停和继续任务）", example = "01")
+    private String zhilin;
 }
\ No newline at end of file
diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/enums/DroneCommandEnum.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/enums/DroneCommandEnum.java
index 970e4d0..ab5357f 100644
--- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/enums/DroneCommandEnum.java
+++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/enums/DroneCommandEnum.java
@@ -101,7 +101,22 @@ public enum DroneCommandEnum {
     /**
      * 云台复位
      */
-    GIMBAL_RESET("GIMBAL_RESET", "云台复位");
+    GIMBAL_RESET("GIMBAL_RESET", "云台复位"),
+
+    /**
+     * 航线飞行
+     */
+    AIRLINE_FLIGHT("AIRLINE_FLIGHT", "航线飞行"),
+
+    /**
+     * 悬停
+     */
+    HOVER("HOVER", "悬停"),
+
+    /**
+     * 继续任务
+     */
+    CONTINUE_TASK("CONTINUE_TASK", "继续任务");
 
     private final String code;
     private final String description;