diff --git a/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java b/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java
index 964ddba..80a61fe 100644
--- a/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java
+++ b/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java
@@ -66,12 +66,16 @@ public class AircraftFlyController extends BaseController
         try {
             CommandType commandType;
             java.util.Map<String, Object> params = new java.util.HashMap<>();
-            
-            // 处理消息ID
-            if (request.getMessageID() != null) {
-                params.put("messageID", request.getMessageID());
+
+            Long currentTaskId = flightService.currentRunningTask(sn);
+            if (currentTaskId != null) {
+                params.put("messageID", currentTaskId);
             } else {
-                params.put("messageID", System.currentTimeMillis());
+                if (request.getMessageID() != null) {
+                    params.put("messageID", request.getMessageID());
+                } else {
+                    params.put("messageID", System.currentTimeMillis());
+                }
             }
 
             // 处理扩展参数
@@ -477,12 +481,12 @@ public class AircraftFlyController extends BaseController
 
         try {
 
-            Long currentTaskId =  flightService.currentRunningTask(request.getSn());
+            Long currentTaskId = flightService.currentRunningTask(request.getSn());
             java.util.Map<String, Object> params = new java.util.HashMap<>();
-            if(Objects.isNull(currentTaskId)){
-                params.put("messageID", UUID.randomUUID().toString());
-            }else {
-                params.put("messageID",currentTaskId);
+            if (currentTaskId != null) {
+                params.put("messageID", currentTaskId);
+            } else {
+                params.put("messageID", System.currentTimeMillis());
             }
             params.put("taskId", 9074);
             params.put("zhilin", "03");