From 1346ece340481c2489dbc4ada7ddd73971991d44 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 19 九月 2024 08:49:23 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/protocol/zldz/analysis/AnalysisGrain.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/protocol/zldz/analysis/AnalysisGrain.java b/src/main/java/com/fzzy/protocol/zldz/analysis/AnalysisGrain.java
index a497bde..b28a874 100644
--- a/src/main/java/com/fzzy/protocol/zldz/analysis/AnalysisGrain.java
+++ b/src/main/java/com/fzzy/protocol/zldz/analysis/AnalysisGrain.java
@@ -439,7 +439,7 @@
outPut.setTemperature(temperature);
outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
outPut.setMinTemperature(min + "");
- outPut.setMaxTemperature(min + "");
+ outPut.setMaxTemperature(max + "");
List<GrainTH> ths = new ArrayList<>();
@@ -466,7 +466,7 @@
weatherStation.setId(device.getDeviceId());
}
weatherStation.setAirPressure(weather.getPressure());
- weatherStation.setHumidity(weather.getHumidity());
+ weatherStation.setHumidity(weather.getHumidity().replaceAll("%",""));
weatherStation.setPm(weather.getAir_pm25());
weatherStation.setRadiation("0");
weatherStation.setRainfallAmount(weather.getWea());
@@ -482,10 +482,10 @@
reqData.setData(JSONObject.toJSONString(grain));
- doPushGrain(reqData);
+ doPushGrain(reqData,grain);
}
- private void doPushGrain(BaseReqData reqData) {
+ private void doPushGrain(BaseReqData reqData,GrainData grainData) {
GatewayDeviceReportService reportService = gatewayRemoteManager.getDeviceReportService(reqData.getDevice().getPushProtocol());
if (null == reportService) {
@@ -493,6 +493,8 @@
return;
}
reportService.reportGrainData(reqData);
+ reqData.setData(reportService.grainData2GatewayApiInfoKafka(grainData,reqData.getDevice()).getData());
+ reportService.reportGrainDataByKafka(reqData);
}
--
Gitblit v1.9.3