From b1c572949997a5d82d9b609163ff280a1c49627d Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 26 四月 2024 14:09:45 +0800
Subject: [PATCH] 粮情协议优化
---
src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java b/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java
index a533499..135bebb 100644
--- a/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java
+++ b/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java
@@ -55,7 +55,9 @@
if ("testGrain".equals(param.getBizType())) {
return testGrain(param);
}
-
+ if ("testGrain".equals(param.getBizType())) {
+ return testGrain(param);
+ }
if ("ajaxTestKafkaGrain".equals(param.getBizType())) {
return ajaxTestKafkaGrain(param);
}
@@ -302,16 +304,19 @@
continue;
}
reqData = new BaseReqData();
+ reqData.setProductId(device.getProductId());
+ reqData.setDeviceName(device.getDeviceName());
reqData.setDeviceId(param.getDeviceId());
reqData.setDayTime(param.getDayTime());
reqData.setDevice(device);
+ //鑾峰彇鍒�
resp = gatewayRemoteManager.getGatewayTestService(device.getPushProtocol()).testGrainKafka(reqData);
-
+ log.info("resp = "+resp.toString());
//鑷姩鎺ㄩ��
if (BaseResp.CODE_200 == resp.getCode()) {
reqData.setData(resp.getData());
- gatewayRemoteManager.getDeviceReportService(device.getPushProtocol()).reportGrainDataByKafka(reqData);
+ gatewayRemoteManager.getDeviceReportService(device.getPushProtocol()).reportGrainDataByHand(reqData);
}
}
--
Gitblit v1.9.3