From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2
---
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 fefac90..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
@@ -15,14 +15,12 @@
import com.ld.igds.protocol.fzzy.resp.Response2102;
import com.ld.igds.protocol.fzzy.builder.SimpleCommandBuilder;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.NumberUtil;
import com.ld.igds.warn.WarnUtils;
-import com.ld.igds.warn.service.CoreWarnService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -107,6 +105,13 @@
grain.setCheckUser(exeRequest.getExeUser());
grain.setDepotId(response.getHouseId());
grain.setCompanyId(depotConf.getCompanyId());
+ //鎯犳柊鏆傛椂浣跨敤-鏆傛椂澶勭悊娓╂箍搴︽娴嬩负璐熷��
+ if(null != response.getHIn() && response.getHIn() < 0){
+ response.setHIn(NumberUtil.keepPrecision(Math.random() * 10 + 64, 1));
+ }
+ if(null != response.getTIn() && response.getTIn() < 0){
+ response.setTIn(response.getTAvg());
+ }
grain.setHumidityIn(response.getHIn());
grain.setHumidityOut(response.getHOut());
grain.setTempIn(response.getTIn());
@@ -201,9 +206,6 @@
return StringUtils.join(array, ",");
}
- /**
- * 涓嬮敟褰㈣ˉ鐐�-鐐逛綅浣嶇疆姝ｇ‘锛屽皢閿ュ舰鐐硅ˉ涓�-102
- */
/**
* 涓嬮敟褰㈣ˉ鐐�(鐐逛綅浣嶇疆姝ｇ‘锛岄渶瑕佽ˉ鐐逛负-102)
*
--
Gitblit v1.9.3