Merge remote-tracking branch 'origin/cjl' into dev

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

Merge remote-tracking branch 'origin/cjl' into dev

 screen-api/src/main/java/com/moral/api/controller/YcReptilesController.java

@@ -673,7 +673,7 @@
                if(6 == type){
                    topThreeNum.append("。");
                }else {
                    topThreeNum.append(";");
                    topThreeNum.append("；");
                }

            }

 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() ){