From 7e837dff3fb24f65e5c5053b44b373ec40aab207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Sat, 28 Feb 2026 14:52:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/domain/DroneFlightControlRequest.java | 13 +++++
 .../device/api/enums/DroneCommandEnum.java    | 47 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 1 deletion(-)

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 260af5e..0414226 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
@@ -46,4 +46,17 @@ public class DroneFlightControlRequest implements Serializable {
     /** 消息ID */
     @Schema(description = "消息ID", example = "9056")
     private Long messageID;
+
+    /** 扩展值（用于云台控制等） */
+    @Schema(description = "扩展值（用于云台控制等）", example = "90")
+    private String evalue;
+
+    /** 值（用于云台控制等） */
+    @Schema(description = "值（用于云台控制等）", example = "04")
+    private String value;
+
+    //专门用于云台变焦命令的，用于指定相机的灯光模式。
+    /** 灯光模式（用于相机控制） */
+    @Schema(description = "灯光模式（用于相机控制）", example = "visibleLight")
+    private String lightMode;
 }
\ 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 1a221d8..fe07c8e 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
@@ -56,7 +56,52 @@ public enum DroneCommandEnum {
     /**
      * 急停
      */
-    EMERGENCY_STOP("EMERGENCY_STOP", "急停");
+    EMERGENCY_STOP("EMERGENCY_STOP", "急停"),
+
+    /**
+     * 切换可见光
+     */
+    SWITCH_VISIBLE_LIGHT("SWITCH_VISIBLE_LIGHT", "切换可见光"),
+
+    /**
+     * 云台变焦
+     */
+    GIMBAL_ZOOM("GIMBAL_ZOOM", "云台变焦"),
+
+    /**
+     * 切换红外
+     */
+    SWITCH_IR("SWITCH_IR", "切换红外"),
+
+    /**
+     * 切换广角
+     */
+    SWITCH_WIDE_ANGLE("SWITCH_WIDE_ANGLE", "切换广角"),
+
+    /**
+     * 云台右移
+     */
+    GIMBAL_MOVE_RIGHT("GIMBAL_MOVE_RIGHT", "云台右移"),
+
+    /**
+     * 云台左移
+     */
+    GIMBAL_MOVE_LEFT("GIMBAL_MOVE_LEFT", "云台左移"),
+
+    /**
+     * 云台俯仰（上）
+     */
+    GIMBAL_PITCH_UP("GIMBAL_PITCH_UP", "云台俯仰（上）"),
+
+    /**
+     * 云台俯仰（下）
+     */
+    GIMBAL_PITCH_DOWN("GIMBAL_PITCH_DOWN", "云台俯仰（下）"),
+
+    /**
+     * 云台复位
+     */
+    GIMBAL_RESET("GIMBAL_RESET", "云台复位");
 
     private final String code;
     private final String description;

From e20c2f389ed6da2314a326e579e317553b57ae3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Sat, 28 Feb 2026 14:57:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A3=9E=E6=8E=A7=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/device/api/enums/DroneCommandEnum.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 fe07c8e..970e4d0 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
@@ -48,10 +48,10 @@ public enum DroneCommandEnum {
      */
     DOWN("DOWN", "下降"),
 
-    /**
-     * 返航
-     */
-    RETURN_HOME("RETURN_HOME", "返航"),
+//    /**
+//     * 返航
+//     */
+//    RETURN_HOME("RETURN_HOME", "返航"),
 
     /**
      * 急停