From 5d4403f55c4337c56f650ff8a9e77ee35f3d17b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Thu, 26 Feb 2026 09:37:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/TuohengMqttMessageHandler.java    | 30 +++++++++----------
 .../device/service/impl/TuohengService.java   |  3 +-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/domain/impl/tuohengmqtt/handler/TuohengMqttMessageHandler.java b/src/main/java/com/ruoyi/device/domain/impl/tuohengmqtt/handler/TuohengMqttMessageHandler.java
index 1849ece..db9dcbf 100644
--- a/src/main/java/com/ruoyi/device/domain/impl/tuohengmqtt/handler/TuohengMqttMessageHandler.java
+++ b/src/main/java/com/ruoyi/device/domain/impl/tuohengmqtt/handler/TuohengMqttMessageHandler.java
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
 public class TuohengMqttMessageHandler {
 
     private final ObjectMapper objectMapper = new ObjectMapper();
-    private MqttCallbackRegistry mqttCallbackRegistry;
+    private MqttCallbackRegistry machineCallBackRegistry;
 
     private final List<ITuohengRealTimeDataCallback> realTimeDataCallbacks = new ArrayList<>();
     private final List<ITuohengOsdCallback> osdCallbacks = new ArrayList<>();
@@ -35,16 +35,16 @@ public class TuohengMqttMessageHandler {
     private final List<IRealTimeBasicCallback> realTimeBasicCallbacks = new ArrayList<>();
     private final List<IDroneRealTimeCallback> droneRealTimeCallbacks = new ArrayList<>();
     private final List<IHeartbeatMessageCallback> heartbeatMessageCallbacks = new ArrayList<>();
-    private final List<com.ruoyi.device.domain.impl.tuohengmqtt.callback.IAirportFlyControlDataCallback> airportFlyControlDataCallbacks = new ArrayList<>();
+    private final List<IAirportFlyControlDataCallback> airportFlyControlDataCallbacks = new ArrayList<>();
 
     private static final Pattern TUOHENG_SN_PATTERN = Pattern.compile("^TH[0-9A-Z]+");
 
     /**
      * 设置 MQTT 回调注册中心
      */
-    public void setMqttCallbackRegistry(MqttCallbackRegistry mqttCallbackRegistry) {
-        this.mqttCallbackRegistry = mqttCallbackRegistry;
-        log.info("设置 MqttCallbackRegistry 成功");
+    public void setMachineCallBackRegistry(MqttCallbackRegistry machineCallBackRegistry) {
+        this.machineCallBackRegistry = machineCallBackRegistry;
+        log.info("设置 machineCallBackRegistry 成功");
     }
 
     public void registerRealTimeDataCallback(ITuohengRealTimeDataCallback callback) {
@@ -101,21 +101,21 @@ public class TuohengMqttMessageHandler {
             log.debug("收到MQTT消息 - Topic: {}", topic);
 
             // 如果是 confirm 消息，打印详细日志
-            if (topic.contains("/control/confirm")) {
-                log.info("【收到confirm消息】Topic: {}, Payload: {}", topic, payload);
-            }
+//            if (topic.contains("/control/confirm")) {
+//                log.info("【收到confirm消息】Topic: {}, Payload: {}", topic, payload);
+//            }
 
             // 通知 MqttCallbackRegistry 处理回调（用于指令回调）
-            if (mqttCallbackRegistry != null) {
+            if (machineCallBackRegistry != null) {
                 try {
                     // 将 payload 解析为 JSON 对象传递给回调注册中心
                     Object messageBody = objectMapper.readValue(payload, Object.class);
-                    mqttCallbackRegistry.handleMessage(topic, messageBody);
+                    machineCallBackRegistry.handleMessage(topic, messageBody);
 
-                    // 如果是 confirm 消息，打印回调处理结果
-                    if (topic.contains("/control/confirm")) {
-                        log.info("【confirm消息已传递给回调注册中心】Topic: {}", topic);
-                    }
+//                    // 如果是 confirm 消息，打印回调处理结果
+//                    if (topic.contains("/control/confirm")) {
+//                        log.info("【confirm消息已传递给回调注册中心】Topic: {}", topic);
+//                    }
                 } catch (Exception e) {
                     log.debug("通知回调注册中心失败: {}", e.getMessage());
                 }
@@ -270,7 +270,7 @@ public class TuohengMqttMessageHandler {
         try {
             log.debug("处理机场飞行控制数据 - 设备SN: {}, Topic: {}", deviceSn, topic);
 
-            for (com.ruoyi.device.domain.impl.tuohengmqtt.callback.IAirportFlyControlDataCallback callback : airportFlyControlDataCallbacks) {
+            for (IAirportFlyControlDataCallback callback : airportFlyControlDataCallbacks) {
                 try {
                     callback.onAirportFlyControlData(deviceSn, payload, topic);
                 } catch (Exception e) {
diff --git a/src/main/java/com/ruoyi/device/service/impl/TuohengService.java b/src/main/java/com/ruoyi/device/service/impl/TuohengService.java
index 802c9c5..921799b 100644
--- a/src/main/java/com/ruoyi/device/service/impl/TuohengService.java
+++ b/src/main/java/com/ruoyi/device/service/impl/TuohengService.java
@@ -12,7 +12,6 @@ import com.ruoyi.device.domain.impl.machine.state.AirportState;
 import com.ruoyi.device.domain.impl.machine.state.MachineStates;
 import com.ruoyi.device.domain.impl.machine.statemachine.MachineStateManager;
 import com.ruoyi.device.domain.impl.tuohengmqtt.callback.IRealTimeBasicCallback;
-import com.ruoyi.device.domain.impl.tuohengmqtt.callback.IAirportFlyControlDataCallback;
 import com.ruoyi.device.domain.impl.tuohengmqtt.callback.ITuohengEventsCallback;
 import com.ruoyi.device.domain.impl.tuohengmqtt.callback.ITuohengOsdCallback;
 import com.ruoyi.device.domain.impl.tuohengmqtt.callback.ITuohengRealTimeDataCallback;
@@ -100,7 +99,7 @@ public class TuohengService {
         TuohengMqttMessageHandler handler = clientManager.getHandler();
 
         // 设置 MqttCallbackRegistry 到 handler（用于指令回调）
-        handler.setMqttCallbackRegistry(mqttCallbackRegistry);
+        handler.setMachineCallBackRegistry(mqttCallbackRegistry);
 
         Map<String, String> mapping = loadAirportDroneMapping();