From 619809ea4fbd5e7dcc08eed7ab44f89c6614ee99 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:35:41 +0800
Subject: [PATCH] fix：日报模板调整
---
screen-api/src/main/java/com/moral/api/service/impl/ReptileResultServiceImpl.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 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 81f2ac3..f859018 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
@@ -149,39 +149,39 @@
for (Element tr : trs) {
Elements tds = tr.select("td");
id = 0;
- if(2 == type && tds.size() == 18){
- 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")){
+ if(2 == type && tds.size() == 19){
+ if(tds.get(1+1).text().equals("NA")&&tds.get(2+1).text().equals("NA")&&tds.get(3+1).text().equals("NA")&&tds.get(4+1).text().equals("NA")&&tds.get(5+1).text().equals("NA")){
continue;
}
- 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())
- .granule25(tds.get(11).text().equals("NA")?0:Double.valueOf(tds.get(11).text())).granule25Index(tds.get(12).text().equals("NA")?0:Double.valueOf(tds.get(12).text())).AQI(tds.get(13).text())
- .SW(tds.get(14).text()).airQuality(tds.get(15).text()).category(tds.get(16).text())
- .colour(tds.get(17).text())
+ AqiResultVo testVo = AqiResultVo.builder().name(tds.get(0+1).text()).SO2(tds.get(1+1).text().equals("NA")?0:Double.valueOf(tds.get(1+1).text()))
+ .SO2Index(tds.get(2+1).text().equals("NA")?0:Double.valueOf(tds.get(2+1).text())).NO2(tds.get(3+1).text().equals("NA")?0:Double.valueOf(tds.get(3+1).text())).NO2Index(tds.get(4+1).text().equals("NA")?0:Double.valueOf(tds.get(4+1).text()))
+ .granule(tds.get(5+1).text().equals("NA")?0:Double.valueOf(tds.get(5+1).text())).granuleIndex(tds.get(6+1).text().equals("NA")?0:Double.valueOf(tds.get(6+1).text())).CO(tds.get(7+1).text().equals("NA")?0:Double.valueOf(tds.get(7+1).text()))
+ .COIndex(tds.get(8+1).text().equals("NA")?0:Double.valueOf(tds.get(8+1).text())).OO(tds.get(9+1).text()).OOIndex(tds.get(10+1).text())
+ .granule25(tds.get(11+1).text().equals("NA")?0:Double.valueOf(tds.get(11+1).text())).granule25Index(tds.get(12+1).text().equals("NA")?0:Double.valueOf(tds.get(12+1).text())).AQI(tds.get(13+1).text())
+ .SW(tds.get(14+1).text()).airQuality(tds.get(15+1).text()).category(tds.get(16+1).text())
+ .colour(tds.get(17+1).text())
.build();
tableResult.add(testVo);
- }else if(3 == type && 23 == tds.size()){
+ }else if(3 == type && 24 == tds.size()){
SixConcentrationsVo sixConcentrationsVo = SixConcentrationsVo.builder()
- .name(tds.get(0).text()).SO2(Double.valueOf(tds.get(1).text()))
- .SO2ExceedingMultiple(tds.get(2).text()).SO2Avg(Double.valueOf(tds.get(3).text())).SO2ExceedingMultipleTwo(tds.get(4).text())
- .NO2(Double.valueOf(tds.get(5).text())).NO2ExceedingMultiple(tds.get(6).text()).NO2Avg(Double.valueOf(tds.get(7).text()))
- .NO2ExceedingMultipleTwo(tds.get(8).text()).PM10(Double.valueOf(tds.get(9).text())).PM10ExceedingMultiple(tds.get(10).text())
- .PM10Avg(Double.valueOf(tds.get(11).text())).PM10ExceedingMultipleTwo(tds.get(12).text()).CO(Double.valueOf(tds.get(13).text()))
- .COAvg(Double.valueOf(tds.get(14).text())).COExceedingMultipleTwo(tds.get(15).text()).OO(Double.valueOf(tds.get(16).text()))
- .OOAvg(Double.valueOf(tds.get(17).text())).OOExceedingMultipleTwo(tds.get(18).text()).PM25(Double.valueOf(tds.get(19).text()))
- .PM25ExceedingMultiple(tds.get(20).text()).PM25Avg(Double.valueOf(tds.get(21).text())).PM25ExceedingMultipleTwo(tds.get(22).text())
+ .name(tds.get(0+1).text()).SO2(Double.valueOf(tds.get(1+1).text()))
+ .SO2ExceedingMultiple(tds.get(2+1).text()).SO2Avg(Double.valueOf(tds.get(3+1).text())).SO2ExceedingMultipleTwo(tds.get(4+1).text())
+ .NO2(Double.valueOf(tds.get(5+1).text())).NO2ExceedingMultiple(tds.get(6+1).text()).NO2Avg(Double.valueOf(tds.get(7+1).text()))
+ .NO2ExceedingMultipleTwo(tds.get(8+1).text()).PM10(Double.valueOf(tds.get(9+1).text())).PM10ExceedingMultiple(tds.get(10+1).text())
+ .PM10Avg(Double.valueOf(tds.get(11+1).text())).PM10ExceedingMultipleTwo(tds.get(12+1).text()).CO(Double.valueOf(tds.get(13+1).text()))
+ .COAvg(Double.valueOf(tds.get(14+1).text())).COExceedingMultipleTwo(tds.get(15+1).text()).OO(Double.valueOf(tds.get(16+1).text()))
+ .OOAvg(Double.valueOf(tds.get(17+1).text())).OOExceedingMultipleTwo(tds.get(18+1).text()).PM25(Double.valueOf(tds.get(19+1).text()))
+ .PM25ExceedingMultiple(tds.get(20+1).text()).PM25Avg(Double.valueOf(tds.get(21+1).text())).PM25ExceedingMultipleTwo(tds.get(22+1).text())
.build();
tableSixResult.add(sixConcentrationsVo);
- }else if(1 == type && 20 == tds.size()){
+ }else if(1 == type && 21 == tds.size()){
SixConcentrationsVo sixConcentrationsVo = SixConcentrationsVo.builder()
- .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())
+ .excellentRateName(tds.get(1+1).text()).excellentRateRatio(tds.get(14+1).text().equals("-")?0:Double.valueOf(tds.get(14+1).text()))
+ .excellentRateRatioYoY(tds.get(15+1).text().equals("-")?0:Double.valueOf(tds.get(15+1).text())).name(tds.get(1+1).text())
.build();
tableSixResult.add(sixConcentrationsVo);
- }else if(4 == type && 28 == tds.size() ){
- int rDay = BigDecimal.valueOf(Double.valueOf(tds.get(25).text())).subtract(BigDecimal.valueOf(Double.valueOf(tds.get(26).text()))).intValue();
+ }else if(4 == type && 29 == tds.size() ){
+ int rDay = BigDecimal.valueOf(Double.valueOf(tds.get(25+1).text())).subtract(BigDecimal.valueOf(Double.valueOf(tds.get(26+1).text()))).intValue();
map.put("surplusDay",rDay);
}
for (Element td : tds) {
--
Gitblit v1.8.0