From a4d1e11a3ee5739d0f3089c53510baad571d9427 Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期四, 19 十月 2023 19:50:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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 0929b3c..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()); -- Gitblit v1.9.3