From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java b/server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java
index d15c553..b050971 100644
--- a/server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java
+++ b/server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java
@@ -1,11 +1,10 @@
package com.doumee.core.mqtt.service;
+import com.doumee.core.mqtt.config.MqttClientInit;
import com.doumee.core.mqtt.config.MqttConfig;
import com.doumee.service.business.DeviceService;
import com.doumee.service.business.DeviceSubcribeService;
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.eclipse.paho.client.mqttv3.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,9 +20,13 @@
//鎺ユ敹娑堟伅鍥炶皟
@Override
public void connectionLost(Throwable cause) {
-
// 杩炴帴涓㈠け鍚庯紝涓�鑸湪杩欓噷闈㈣繘琛岄噸杩�
- System.out.println("杩炴帴鏂紑锛屽彲浠ュ仛閲嶈繛");
+ System.out.println("杩炴帴鏂紑锛岄噸杩炰腑");
+ try {
+ MqttClientInit.refreshClient();
+ } catch (MqttException e) {
+ throw new RuntimeException(e);
+ }
}
@Override
@@ -34,9 +37,13 @@
@Override
public void messageArrived(String topic, MqttMessage message) throws Exception {
// subscribe鍚庡緱鍒扮殑娑堟伅浼氭墽琛屽埌杩欓噷闈�
- System.out.println("鎺ユ敹娑堟伅涓婚 : " + topic);
- System.out.println("鎺ユ敹娑堟伅Qos : " + message.getQos());
- System.out.println("鎺ユ敹娑堟伅鍐呭 : " + new String(message.getPayload()));
- deviceSubcribeService.listener(new String(message.getPayload()),topic);
+ try {
+ System.out.println("鎺ユ敹娑堟伅涓婚 : " + topic);
+ System.out.println("鎺ユ敹娑堟伅Qos : " + message.getQos());
+ System.out.println("鎺ユ敹娑堟伅鍐呭 : " + new String(message.getPayload()));
+ deviceSubcribeService.listener(message.getId()+"",new String(message.getPayload()),topic);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
}
}
--
Gitblit v1.9.3