From 4da6ddeb728bb4649328aa652ffc1c56b0e81629 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 22 Apr 2024 11:42:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/ReptileResultServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ReptileResultServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ReptileResultServiceImpl.java
index 615bab5..81f2ac3 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ReptileResultServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ReptileResultServiceImpl.java
@@ -153,7 +153,7 @@
if(tds.get(1).text().equals("NA")&&tds.get(2).text().equals("NA")&&tds.get(3).text().equals("NA")&&tds.get(4).text().equals("NA")&&tds.get(5).text().equals("NA")){
continue;
}
- AqiResultVo testVo = AqiResultVo.builder().name(tds.get(0).text()).SO2(Double.valueOf(tds.get(1).text()))
+ AqiResultVo testVo = AqiResultVo.builder().name(tds.get(0).text()).SO2(tds.get(1).text().equals("NA")?0:Double.valueOf(tds.get(1).text()))
.SO2Index(tds.get(2).text().equals("NA")?0:Double.valueOf(tds.get(2).text())).NO2(tds.get(3).text().equals("NA")?0:Double.valueOf(tds.get(3).text())).NO2Index(tds.get(4).text().equals("NA")?0:Double.valueOf(tds.get(4).text()))
.granule(tds.get(5).text().equals("NA")?0:Double.valueOf(tds.get(5).text())).granuleIndex(tds.get(6).text().equals("NA")?0:Double.valueOf(tds.get(6).text())).CO(tds.get(7).text().equals("NA")?0:Double.valueOf(tds.get(7).text()))
.COIndex(tds.get(8).text().equals("NA")?0:Double.valueOf(tds.get(8).text())).OO(tds.get(9).text()).OOIndex(tds.get(10).text())
@@ -176,8 +176,8 @@
tableSixResult.add(sixConcentrationsVo);
}else if(1 == type && 20 == tds.size()){
SixConcentrationsVo sixConcentrationsVo = SixConcentrationsVo.builder()
- .excellentRateName(tds.get(1).text()).excellentRateRatio(Double.valueOf(tds.get(14).text()))
- .excellentRateRatioYoY(Double.valueOf(tds.get(15).text())).name(tds.get(1).text())
+ .excellentRateName(tds.get(1).text()).excellentRateRatio(tds.get(14).text().equals("-")?0:Double.valueOf(tds.get(14).text()))
+ .excellentRateRatioYoY(tds.get(15).text().equals("-")?0:Double.valueOf(tds.get(15).text())).name(tds.get(1).text())
.build();
tableSixResult.add(sixConcentrationsVo);
}else if(4 == type && 28 == tds.size() ){
--
Gitblit v1.8.0