From d52795fc5de0b6ed748cd2ef217dcd1371e4b8e9 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 10 十一月 2023 01:06:13 +0800
Subject: [PATCH] 重新调整代码结构和实现方式
---
src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 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..5957fe6 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
@@ -7,9 +7,8 @@
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
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 com.fzzy.gateway.data.BaseReqData;
+import com.fzzy.mqtt.MqttGatewayService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -25,7 +24,7 @@
@Resource
private GatewayRemoteManager gatewayRemoteManager;
@Resource
- private MqttPublishService publishService;
+ private MqttGatewayService mqttGatewayService;
/**
@@ -33,21 +32,19 @@
*
* @param message
*/
- public void onReceiveMessage(String message) {
+ public void onReceiveMessage(String topic,String message) {
try {
CloudSendData cloudSendData = JSONObject.parseObject(message, CloudSendData.class);
-
String functionId = cloudSendData.getFunctionId();
-
//绮儏閲囬泦
if (ScConstant.FUNCTION_getTAndRHInfo.equals(functionId)) {
getTAndRHInfo(cloudSendData);
}
} catch (Exception e) {
-
+ log.error("--------鎵ц寮傚父-----{}",e);
}
}
@@ -58,7 +55,7 @@
GatewayDevice device = GatewayUtils.getCacheByDeviceId(deviceId);
- SyncReqData syncReqData = new SyncReqData();
+ BaseReqData syncReqData = new BaseReqData();
syncReqData.setDeviceId(deviceId);
syncReqData.setMessageId(cloudSendData.getMessageId());
syncReqData.setMessageType(cloudSendData.getMessageType());
@@ -66,17 +63,17 @@
syncReqData.setAutoReplay(true);
syncReqData.setDevice(device);
- BaseResp resp = gatewayRemoteManager.getSyncGrainService(device.getSyncProtocol()).syncGrain2(syncReqData);
+
+ //TODO --->>鏆傛椂杩斿洖娴嬭瘯鏁版嵁
+
+ //BaseResp resp = gatewayRemoteManager.getSyncGrainService(device.getSyncProtocol()).syncGrain(syncReqData);
+
+ BaseResp resp = gatewayRemoteManager.getGatewayTestService(device.getPushProtocol()).testGrain(syncReqData);
//鑷姩鎺ㄩ��
if (200 == resp.getCode() && syncReqData.isAutoReplay()) {
- String topic = ScConstant.TOPIC_REPORT;
-
- topic = topic.replace("${productId}", device.getProductId()).replace("${deviceId}", device.getDeviceId());
-
- publishService.publishMsg(topic, resp.getData());
-
- log.info("=======绮儏鎺ㄩ��==========={}", resp.getData());
+ syncReqData.setData(resp.getData());
+ gatewayRemoteManager.getDeviceReportService(device.getPushProtocol()).reportGrainData(syncReqData);
}
}
}
--
Gitblit v1.9.3