From 715f40da0c953ec0080ccf056f9d759c3a249ea0 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 10 十一月 2023 01:37:12 +0800
Subject: [PATCH] 重新调整代码结构和实现方式2,注意设备中的上行协议调整
---
src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 5957fe6..e7b4560 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
@@ -1,14 +1,14 @@
package com.fzzy.gateway.hx2023.service;
import com.alibaba.fastjson2.JSONObject;
+import com.fzzy.api.data.GatewayDeviceProtocol;
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.GatewayRemoteManager;
+import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.CloudSendData;
-import com.fzzy.gateway.data.BaseReqData;
-import com.fzzy.mqtt.MqttGatewayService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -23,8 +23,6 @@
@Resource
private GatewayRemoteManager gatewayRemoteManager;
- @Resource
- private MqttGatewayService mqttGatewayService;
/**
@@ -32,7 +30,7 @@
*
* @param message
*/
- public void onReceiveMessage(String topic,String message) {
+ public void onReceiveMessage(String topic, String message) {
try {
CloudSendData cloudSendData = JSONObject.parseObject(message, CloudSendData.class);
@@ -44,7 +42,7 @@
}
} catch (Exception e) {
- log.error("--------鎵ц寮傚父-----{}",e);
+ log.error("--------鎵ц寮傚父-----{}", e);
}
}
@@ -57,6 +55,8 @@
BaseReqData syncReqData = new BaseReqData();
syncReqData.setDeviceId(deviceId);
+ syncReqData.setProductId(device.getProductId());
+ syncReqData.setDeviceName(device.getDeviceName());
syncReqData.setMessageId(cloudSendData.getMessageId());
syncReqData.setMessageType(cloudSendData.getMessageType());
syncReqData.setFunctionId(cloudSendData.getFunctionId());
@@ -64,11 +64,12 @@
syncReqData.setDevice(device);
- //TODO --->>鏆傛椂杩斿洖娴嬭瘯鏁版嵁
-
- //BaseResp resp = gatewayRemoteManager.getSyncGrainService(device.getSyncProtocol()).syncGrain(syncReqData);
-
- BaseResp resp = gatewayRemoteManager.getGatewayTestService(device.getPushProtocol()).testGrain(syncReqData);
+ BaseResp resp;
+ if (GatewayDeviceProtocol.DEVICE_TEST.getCode().equals(device.getSyncProtocol())) {
+ resp = gatewayRemoteManager.getGatewayTestService(device.getPushProtocol()).testGrain(syncReqData);
+ } else {
+ resp = gatewayRemoteManager.getSyncGrainService(device.getSyncProtocol()).syncGrain(syncReqData);
+ }
//鑷姩鎺ㄩ��
if (200 == resp.getCode() && syncReqData.isAutoReplay()) {
--
Gitblit v1.9.3