From f1d2c2c7730540e0ee1f4ac28551886be8b89cb1 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 03 七月 2023 09:42:26 +0800
Subject: [PATCH] 邦海控制柜
---
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisGas.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisGas.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisGas.java
index 170c5a0..efb1855 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisGas.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisGas.java
@@ -22,6 +22,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -55,7 +57,12 @@
log.info("姘斾綋妫�娴嬪紑濮嬭В鏋�");
Res209 res209 = JSONObject.parseObject(reMessage.getContentStr(),Res209.class);
+ if(2==res209.getState()){
+ }else{
+ log.info("姘斾綋娌℃湁閲囬泦瀹屾垚锛屽彇娑堣В鏋愶紒");
+ return;
+ }
DepotConf depotConf = commonService.getCacheDepotConfBySerId(ser.getCompanyId(),ser.getId() );
//涓讳綋淇℃伅
Gas gas = new Gas();
@@ -77,7 +84,8 @@
info.setId(ContextUtil.buildInfoId(gas.getCompanyId(), gas.getDepotId(), gas.getBatchId()));
info.setPassCode(i+1);
info.setPerCo2(cO2ValArray[i].doubleValue());
- info.setPerO2(99 - (n2ValArray[i].doubleValue() /10 ));
+ NumberFormat numberFormat = new DecimalFormat("0.00");
+ info.setPerO2(Double.parseDouble(numberFormat.format(99 - (n2ValArray[i].doubleValue() /10 ))));
info.setPerPh3(pH3ValArray[i].doubleValue());
info.setPerN2(n2ValArray[i].doubleValue() / 10);
items.add(info);
--
Gitblit v1.9.3