From f27f3ea5055888f7f1c797d0fd7fb26a2013c89c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 19:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java
index ded366b..7e08a4d 100644
--- a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java
+++ b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java
@@ -106,10 +106,10 @@
grain.setDepotId(response.getHouseId());
grain.setCompanyId(depotConf.getCompanyId());
//鎯犳柊鏆傛椂浣跨敤-鏆傛椂澶勭悊娓╂箍搴︽娴嬩负璐熷��
- if(response.getHIn() < 0){
+ if(null != response.getHIn() && response.getHIn() < 0){
response.setHIn(NumberUtil.keepPrecision(Math.random() * 10 + 64, 1));
}
- if(response.getTIn() < 0){
+ if(null != response.getTIn() && response.getTIn() < 0){
response.setTIn(response.getTAvg());
}
grain.setHumidityIn(response.getHIn());
@@ -206,9 +206,6 @@
return StringUtils.join(array, ",");
}
- /**
- * 涓嬮敟褰㈣ˉ鐐�-鐐逛綅浣嶇疆姝ｇ‘锛屽皢閿ュ舰鐐硅ˉ涓�-102
- */
/**
* 涓嬮敟褰㈣ˉ鐐�(鐐逛綅浣嶇疆姝ｇ‘锛岄渶瑕佽ˉ鐐逛负-102)
*
--
Gitblit v1.9.3