From 083eb4417a04201f1eb755faab8ee7121b3c7f16 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 17 十一月 2023 16:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
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