From 19bddd3beb27b359886384a41b97e02dae07f6c8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 29 八月 2023 21:11:38 +0800
Subject: [PATCH] 优化配置信息
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/AnalysisService.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/AnalysisService.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/AnalysisService.java
index 0cff6e1..59b1fbf 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/AnalysisService.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/AnalysisService.java
@@ -18,6 +18,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.text.DecimalFormat;
import java.util.Date;
import java.util.List;
@@ -80,17 +81,26 @@
int sumNum = results.size();
double co2, o2, ph3, n2;
+ DecimalFormat df = new DecimalFormat("#0.00");
double sumO2 = 0.0, sumCo2 = 0.0, sumPh3 = 0.0, sumN2 = 0.0;
+ int num = 1;
StringBuffer sb = new StringBuffer();
for (ModbusGasResult gasResult : results) {
+ //浜屾哀鍖栫⒊锛屽崟浣嶏細PPM锛岀洿鎺ヤ娇鐢�
co2 = gasResult.getCo2().doubleValue();
- o2 = gasResult.getO2().doubleValue();
+ //姘ф皵锛岄櫎浠�10锛屽崟浣嶏細鐧惧垎姣�
+ o2 = Double.valueOf(df.format(gasResult.getO2().doubleValue()*0.1));
+ //纾峰寲姘紝鍗曚綅锛歅PM锛岀洿鎺ヤ娇鐢�
ph3 = gasResult.getPh3().doubleValue();
- n2 = -100;
+ n2 = Double.valueOf(df.format(99.9 - o2));;
- //TODO >>>>> 鏍规嵁杩斿洖鍊艰繘琛屽垽鏂拰杞崲
-
-
+ if(num == 1){
+ gas.setPerCo2Min(co2);
+ gas.setPerO2Min(o2);
+ gas.setPerPh3Min(ph3);
+ gas.setPerN2Min(n2);
+ }
+ num ++;
if (gas.getPerCo2Max() < co2) {
gas.setPerCo2Max(co2);
}
--
Gitblit v1.9.3