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 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java
index 2bf419b..4061c62 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java
@@ -73,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()) {
@@ -153,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