From 320350eb18e32a9a008c4e6409441730732e2e97 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 17 二月 2025 16:24:55 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
index 19ce2cf..0a8e17b 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -108,7 +108,7 @@
weightInfo.setNetWeight(reqData.getWeight());
weightInfo.setWeightUnit("KG");
JSONObject jsonObject = new JSONObject();
- jsonObject.put("weightInfo", weightInfo);
+ jsonObject.put("weightInfo", JSON.toJSONString(weightInfo));
packet.setProperties(jsonObject);
@@ -611,7 +611,7 @@
//濡傛灉鏄紓甯稿��,鎵ц璋冩暣鏁版嵁 TODO
if (Double.valueOf(curTemp) < -99.9) {
- curTemp = output.getAvgTemperature();
+ //curTemp = output.getAvgTemperature();
} else {
//鍒ゆ柇鏈�澶�
@@ -640,13 +640,17 @@
//浠撴俯搴︿俊鎭�
KafkaGrainTH grainTH = new KafkaGrainTH();
List<GrainTH> ths= output.getTemperatureAndhumidity();
- grainTH.setHumidity(ths.get(0).getHumidity());
- grainTH.setTemperature(ths.get(0).getTemperature() );
+ if(ths != null && ths.size() > 0){
+ grainTH.setHumidity(ths.get(0).getHumidity());
+ grainTH.setTemperature(ths.get(0).getTemperature() );
+ }
+
GrainWeather weather = JSON.parseObject(grainData.getWeatherStation(),GrainWeather.class);
- grainTH.setAirHumidity(weather.getHumidity());
- grainTH.setAirTemperature(weather.getTemperature() );
-
+ if (weather!=null){
+ grainTH.setAirHumidity(weather.getHumidity());
+ grainTH.setAirTemperature(weather.getTemperature() );
+ }
List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
temperatureAndhumidity.add(grainTH);
--
Gitblit v1.9.3