From 1f5947ccb5b02817dbe5aaae943c0a7fcfc2cd62 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 00:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..e782bd8 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,14 @@
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.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 +25,7 @@
@Resource
private GatewayRemoteManager gatewayRemoteManager;
@Resource
- private MqttProviderConfig providerClient;
+ private MqttPublishService publishService;
/**
@@ -70,11 +70,11 @@
//鑷姩鎺ㄩ��
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());
+ publishService.publishMsg(topic, resp.getData());
log.info("=======绮儏鎺ㄩ��==========={}", resp.getData());
}
--
Gitblit v1.9.3