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/service/GatewayDeviceTestPR.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java
index 44e8349..4061c62 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java
@@ -1,20 +1,18 @@
package com.fzzy.gateway.service;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.api.utils.DateUtil;
-import com.fzzy.async.fzzy40.Fzzy40CommonService;
import com.fzzy.async.fzzy40.entity.Fz40Grain;
-import com.fzzy.gateway.api.DeviceReportService;
+import com.fzzy.gateway.api.GatewayDeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.data.BaseResp;
+import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.*;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;
-import com.fzzy.mqtt.MqttGatewayService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
@@ -59,7 +57,7 @@
*/
@Expose
public String ajaxTestGrain2(GatewayDevice data) {
- SyncReqData reqData = new SyncReqData();
+ BaseReqData reqData = new BaseReqData();
reqData.setDevice(data);
reqData.setAutoReplay(true);
reqData.setMessageType(ScConstant.MESSAGE_TYPE_INVOKE_FUNCTION);
@@ -75,7 +73,7 @@
return "ERROR锛氬綋鍓嶈澶囨病鏈夐厤缃竷绾胯鍒欙紝鏃犳硶鎵ц";
}
- BaseResp resp = gatewayRemoteManager.getSyncGrainService(data.getSyncProtocol()).syncGrain2(reqData);
+ BaseResp resp = gatewayRemoteManager.getSyncGrainService(data.getSyncProtocol()).syncGrain(reqData);
//鑷姩鎺ㄩ��
if (200 == resp.getCode() && reqData.isAutoReplay()) {
@@ -130,7 +128,7 @@
KafaGrainData pushData;
- DeviceReportService deviceReportService = null;
+ GatewayDeviceReportService deviceReportService = null;
for (GatewayDevice device : list) {
depotIdSys = device.getDepotIdSys();
@@ -155,11 +153,11 @@
if (null == deviceReportService) {
- deviceReportService = gatewayRemoteManager.getDeviceReportService(device.getProvinceProtocol());
+ deviceReportService = gatewayRemoteManager.getDeviceReportService(device.getPushProtocol());
}
- deviceReportService.pushGrainData2Cloud(pushData);
+ // deviceReportService.pushGrainData2Cloud(pushData);
}
--
Gitblit v1.9.3