From 19860e76e91baf3cfce3c45bfa3ca886788c4ec8 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 11:59:59 +0800
Subject: [PATCH] 调整MQTT

---
 src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java b/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
index e782bd8..f2eed2f 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
@@ -8,6 +8,7 @@
 import com.fzzy.gateway.hx2023.ScConstant;
 import com.fzzy.gateway.hx2023.data.CloudSendData;
 import com.fzzy.gateway.hx2023.data.SyncReqData;
+import com.fzzy.mqtt.MqttGatewayService;
 import com.fzzy.mqtt.MqttProviderConfig;
 import com.fzzy.mqtt.MqttPublishService;
 import lombok.extern.slf4j.Slf4j;
@@ -25,7 +26,7 @@
     @Resource
     private GatewayRemoteManager gatewayRemoteManager;
     @Resource
-    private MqttPublishService publishService;
+    private MqttGatewayService mqttGatewayService;
 
 
     /**
@@ -33,7 +34,7 @@
      *
      * @param message
      */
-    public void onReceiveMessage(String message) {
+    public void onReceiveMessage(String topic,String message) {
 
         try {
             CloudSendData cloudSendData = JSONObject.parseObject(message, CloudSendData.class);
@@ -47,7 +48,7 @@
             }
 
         } catch (Exception e) {
-
+            log.error("--------鎵ц寮傚父-----{}",e);
         }
 
     }
@@ -74,9 +75,11 @@
 
             topic = topic.replace("${productId}", device.getProductId()).replace("${deviceId}", device.getDeviceId());
 
-            publishService.publishMsg(topic, resp.getData());
+            mqttGatewayService.publishMqttWithTopic(resp.getData(), topic);
 
-            log.info("=======绮儏鎺ㄩ��==========={}", resp.getData());
+            log.info("----------------------------鎺ㄩ�丮QTT淇℃伅---------------------------");
+            log.info("-----TOPIC-----{}",topic);
+            log.info("-----Message-----{}",resp.getData());
         }
     }
 }

--
Gitblit v1.9.3