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 | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 742bbf0..f2eed2f 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
@@ -3,14 +3,15 @@
import com.alibaba.fastjson2.JSONObject;
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.GatewayRemoteManager;
-import com.fzzy.gateway.hx2023.data.CloudSendData;
+import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
-import com.fzzy.gateway.data.BaseResp;
+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;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -25,7 +26,7 @@
@Resource
private GatewayRemoteManager gatewayRemoteManager;
@Resource
- private MqttProviderConfig providerClient;
+ 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);
}
}
@@ -70,13 +71,15 @@
//鑷姩鎺ㄩ��
if (200 == resp.getCode() && syncReqData.isAutoReplay()) {
- String topic = "/${productId}/${deviceId}/properties/report";
+ String topic = ScConstant.TOPIC_REPORT;
topic = topic.replace("${productId}", device.getProductId()).replace("${deviceId}", device.getDeviceId());
- providerClient.publish(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