From 6495040bbda5308c86e852ad1b080097bfa916a9 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 09 七月 2025 09:22:17 +0800
Subject: [PATCH] 优化粮温检测

---
 src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java b/src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java
index 74b4179..6d60d71 100644
--- a/src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java
@@ -228,12 +228,15 @@
 
             temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));
 
-            sumT += curTemp;
-            if (curTemp > max) {
+            if (curTemp > max  && curTemp < 40) {
                 max = curTemp;
             }
-            if (curTemp < min) {
+            if (curTemp < min && curTemp > 3) {
                 min = curTemp;
+            }
+            if(curTemp > 3 &&  curTemp < 40){
+                sumT += curTemp;
+                sumNum++;
             }
         }
 
@@ -252,7 +255,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<>();
 
 
@@ -279,7 +282,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());

--
Gitblit v1.9.3