From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 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 452ad7c..0470a42 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
@@ -20,13 +20,14 @@
         //鎺ユ敹娑堟伅鍥炶皟
         @Override
         public void connectionLost(Throwable cause) {
+
+            // 杩炴帴涓㈠け鍚庯紝涓�鑸湪杩欓噷闈㈣繘琛岄噸杩�
+            System.out.println("杩炴帴鏂紑锛岄噸杩炰腑");
             try {
                 MqttClientInit.refreshClient();
             } catch (MqttException e) {
                 throw new RuntimeException(e);
             }
-            // 杩炴帴涓㈠け鍚庯紝涓�鑸湪杩欓噷闈㈣繘琛岄噸杩�
-            System.out.println("杩炴帴鏂紑锛屽彲浠ュ仛閲嶈繛");
         }
 
         @Override
@@ -37,9 +38,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