xx

pom.xml

@@ -105,11 +105,10 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Eclipse Paho MQTT Client -->
+        <!-- Spring Integration MQTT -->
         <dependency>
-            <groupId>org.eclipse.paho</groupId>
+            <groupId>org.springframework.integration</groupId>
-            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+            <artifactId>spring-integration-mqtt</artifactId>
-            <version>1.2.5</version>
         </dependency>
 
     </dependencies>

src/main/java/com/ruoyi/device/domain/impl/djimqtt/service/DjiMqttClientService.java

@@ -3,12 +3,17 @@ package com.ruoyi.device.domain.impl.djimqtt.service;
 import com.ruoyi.device.domain.impl.djimqtt.config.DjiMqttClientConfig;
 import com.ruoyi.device.domain.impl.djimqtt.handler.DjiMqttMessageHandler;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.paho.client.mqttv3.*;
+import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
+import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
+import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
+import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
+import org.springframework.integration.channel.DirectChannel;
+import org.springframework.messaging.Message;
 
 /**
- * DJI MQTT客户端服务（可实例化）
+ * DJI MQTT客户端服务（基于Spring Integration MQTT）
- * 支持动态创建多个客户端
+ * 支持动态创建多个客户端，自动重连和重新订阅
  *
  * @author ruoyi
  */
@@ -17,7 +22,7 @@ public class DjiMqttClientService {
 
     private final DjiMqttClientConfig config;
     private final DjiMqttMessageHandler messageHandler;
-    private MqttClient mqttClient;
+    private MqttPahoMessageDrivenChannelAdapter adapter;
 
     /**
      * 无人机OSD主题
@@ -45,7 +50,7 @@ public class DjiMqttClientService {
      */
     public void connect() {
         try {
-            if (mqttClient != null && mqttClient.isConnected()) {
+            if (adapter != null && adapter.isRunning()) {
                 log.info("MQTT客户端[{}]已连接，无需重复连接", config.getClientId());
                 return;
             }
@@ -53,59 +58,64 @@ public class DjiMqttClientService {
             String broker = String.format("tcp://%s:%d", config.getHost(), config.getPort());
             log.info("开始连接DJI MQTT服务器[{}]: {}", config.getClientId(), broker);
 
-            mqttClient = new MqttClient(broker, config.getClientId(), new MemoryPersistence());
+            // 创建MQTT客户端工厂
+            MqttPahoClientFactory clientFactory = createClientFactory(broker);
+
+            // 构建订阅主题
+            String[] topics = buildTopics();
+
+            // 创建消息驱动适配器
+            adapter = new MqttPahoMessageDrivenChannelAdapter(
+                config.getClientId(),
+                clientFactory,
+                topics
+            );
+
+            // 设置消息转换器
+            adapter.setConverter(new DefaultPahoMessageConverter());
+
+            // 设置QoS
+            adapter.setQos(1);
+
+            // 创建消息通道并设置消息处理器
+            DirectChannel channel = new DirectChannel();
+            channel.subscribe(this::handleMessage);
+            adapter.setOutputChannel(channel);
+
+            // 启动适配器
+            adapter.start();
+
+            log.info("MQTT客户端[{}]成功连接到服务器并订阅主题", config.getClientId());
+
+        } catch (Exception e) {
+            log.error("MQTT客户端[{}]连接失败: {}", config.getClientId(), e.getMessage(), e);
+            throw new RuntimeException("MQTT连接失败", e);
+        }
+    }
+
+    /**
+     * 创建MQTT客户端工厂
+     */
+    private MqttPahoClientFactory createClientFactory(String broker) {
+        DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
 
         MqttConnectOptions options = new MqttConnectOptions();
+        options.setServerURIs(new String[]{broker});
         options.setUserName(config.getUsername());
         options.setPassword(config.getPassword().toCharArray());
         options.setConnectionTimeout(config.getConnectionTimeout());
         options.setKeepAliveInterval(config.getKeepAliveInterval());
         options.setAutomaticReconnect(config.getAutoReconnect());
         options.setCleanSession(config.getCleanSession());
-            options.setMqttVersion(MqttConnectOptions.MQTT_VERSION_3_1_1);
 
-            mqttClient.setCallback(new MqttCallback() {
+        factory.setConnectionOptions(options);
-                @Override
+        return factory;
-                public void connectionLost(Throwable cause) {
-                    log.error("MQTT客户端[{}]连接丢失: {}", config.getClientId(), cause.getMessage(), cause);
-                }
-
-                @Override
-                public void messageArrived(String topic, MqttMessage message) {
-                    try {
-                        String payload = new String(message.getPayload());
-                        messageHandler.handleMessage(topic, payload);
-                    } catch (Exception e) {
-                        log.error("MQTT客户端[{}]处理消息失败: {}", config.getClientId(), e.getMessage(), e);
-                    }
-                }
-
-                @Override
-                public void deliveryComplete(IMqttDeliveryToken token) {
-                    // 不需要处理
-                }
-            });
-
-            mqttClient.connect(options);
-            log.info("MQTT客户端[{}]成功连接到服务器", config.getClientId());
-
-            subscribe();
-
-        } catch (Exception e) {
-            log.error("MQTT客户端[{}]连接失败: {}", config.getClientId(), e.getMessage(), e);
-        }
     }
 
     /**
-     * 订阅主题
+     * 构建订阅主题
      */
-    private void subscribe() {
+    private String[] buildTopics() {
-        try {
-            if (mqttClient == null || !mqttClient.isConnected()) {
-                log.warn("MQTT客户端[{}]未连接，无法订阅主题", config.getClientId());
-                return;
-            }
-
         String osdTopic = config.getUseSharedSubscription()
             ? String.format("$share/%s/%s", config.getSharedGroupName(), DRONE_OSD_TOPIC)
             : DRONE_OSD_TOPIC;
@@ -114,14 +124,22 @@ public class DjiMqttClientService {
             ? String.format("$share/%s/%s", config.getSharedGroupName(), DRONE_STATE_TOPIC)
             : DRONE_STATE_TOPIC;
 
-            mqttClient.subscribe(osdTopic, 1);
+        return new String[]{osdTopic, stateTopic};
-            log.info("MQTT客户端[{}]成功订阅主题: {}", config.getClientId(), osdTopic);
+    }
 
-            mqttClient.subscribe(stateTopic, 1);
+    /**
-            log.info("MQTT客户端[{}]成功订阅主题: {}", config.getClientId(), stateTopic);
+     * 处理接收到的MQTT消息
+     */
+    private void handleMessage(Message<?> message) {
+        try {
+            String topic = (String) message.getHeaders().get("mqtt_receivedTopic");
+            String payload = (String) message.getPayload();
 
+            if (topic != null && payload != null) {
+                messageHandler.handleMessage(topic, payload);
+            }
         } catch (Exception e) {
-            log.error("MQTT客户端[{}]订阅主题失败: {}", config.getClientId(), e.getMessage(), e);
+            log.error("MQTT客户端[{}]处理消息失败: ", config.getClientId(), e.getMessage(), e);
         }
     }
 
@@ -130,9 +148,8 @@ public class DjiMqttClientService {
      */
     public void disconnect() {
         try {
-            if (mqttClient != null && mqttClient.isConnected()) {
+            if (adapter != null && adapter.isRunning()) {
-                mqttClient.disconnect();
+                adapter.stop();
-                mqttClient.close();
                 log.info("MQTT客户端[{}]已断开连接", config.getClientId());
             }
         } catch (Exception e) {
@@ -144,7 +161,7 @@ public class DjiMqttClientService {
      * 检查连接状态
      */
     public boolean isConnected() {
-        return mqttClient != null && mqttClient.isConnected();
+        return adapter != null && adapter.isRunning();
     }
 
     /**