Merge remote-tracking branch 'origin/wb' into wb

cjl

2023-09-27 dc1c8c974d9469591ead4dd1d774bbfb97a33331

 screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java

@@ -1627,12 +1627,20 @@
            if (i < 10) {
                Object o = hnMap1.get(s + "-" + month + "-0" + i);
                String s1 = JSON.toJSONString(o);
                if (s1.equals("null")){
                    list2.add(0.0);
                    continue;
                }
                Map map1 = JSON.parseObject(s1, Map.class);
                String pm2_5 = map1.get("PM2_5").toString();
                list2.add(Double.parseDouble(pm2_5));
            } else {
                Object o = hnMap1.get(s + "-" + month + "-" + i);
                String s1 = JSON.toJSONString(o);
                if (s1.equals("null")){
                    list2.add(0.0);
                    continue;
                }
                Map map1 = JSON.parseObject(s1, Map.class);
                String pm2_5 = map1.get("PM2_5").toString();
                list2.add(Double.parseDouble(pm2_5));