From 4cfaac76490c1391237483329719bc6abd4392af Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 29 八月 2023 20:32:00 +0800
Subject: [PATCH] 调整代码
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/AnalysisService.java | 12 +++++++-----
1 files changed, 7 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..30c815f 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,16 +81,17 @@
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;
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;
-
- //TODO >>>>> 鏍规嵁杩斿洖鍊艰繘琛屽垽鏂拰杞崲
-
+ n2 = Double.valueOf(df.format(99.9 - o2));;
if (gas.getPerCo2Max() < co2) {
gas.setPerCo2Max(co2);
--
Gitblit v1.9.3