From 75bdadc0c4e468217b93142d965cd92ee52838ec Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 20 五月 2024 09:01:27 +0800
Subject: [PATCH] 粮情协议优化
---
src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java | 16 +++++++++++++---
1 files changed, 13 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 c0612b4..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);
}
@@ -296,17 +298,25 @@
BaseReqData reqData;
BaseResp resp;
for (GatewayDevice device : list) {
+
+ //濡傛灉涓嶆槸绮儏鍒嗘満璺宠繃
+ if (!GatewayDeviceType.TYPE_07.getCode().equals(device.getType())) {
+ 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