update

jinpengyong

2020-09-21 5a292756180242c83dcb4603a7c425b52be69f6d

update

 src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java

@@ -130,11 +130,12 @@
        bmap.put("cityCode", 110000);
        bmap.put("parentCode", 110000);
        hashSet.add(bmap);
        Map<String, Object> kunShanMap = new HashMap<>();
        kunShanMap.put("name1", "苏州市");
        kunShanMap.put("parentName", "江苏省");
        kunShanMap.put("cityCode", 320500);
        hashSet.add(kunShanMap);
        Map<String, Object> smap = new HashMap<>();
        smap.put("name1", "苏州市");
        smap.put("parentName", "江苏省");
        smap.put("cityCode", 320500);
        smap.put("parentCode", 320000);
        hashSet.add(smap);

        List<Element> elements = Dom4jUtils.readDocument();
        String cityID = "101190404";
@@ -192,7 +193,7 @@
                //风速km/h->m/s
                Double windSpeed = Double.valueOf(nextDayMap.get("windSpeed").toString());
                windSpeed = windSpeed * 1000 / 3600;
                nextDayMap.put("windSpeed",df.format(windSpeed));
                nextDayMap.put("windSpeed", df.format(windSpeed));
                String text = nextDayMap.get("text").toString();
                String condition = "";
                if ("晴".equals(text)) {
@@ -271,15 +272,19 @@
                map.put("times", times);
                map1.put("times", times);
                map1.put("time", hour);
                List<Map<String, Object>> O3List = aqiMapper.getO3(map1);
                if (O3List.size() == 0) {
                    map1.put("cityCode", Integer.valueOf(map.get("parentCode").toString()));
                List<Map<String, Object>> O3List = new ArrayList<>();
                List<Map<String, Object>> beamList=new ArrayList<>();
                if (times.size() != 0) {
                    O3List = aqiMapper.getO3(map1);
                    if (O3List.size() == 0) {
                        map1.put("cityCode", Integer.valueOf(map.get("parentCode").toString()));
                        O3List = aqiMapper.getO3(map1);
                    }
                    if (map.get("macs") != null) {
                        beamList = historyHourlyMapper.getBeamByMacs(map);
                    }
                }
                List<Map<String, Object>> beamList = new ArrayList<>();
                if (map.get("macs") != null) {
                    beamList = historyHourlyMapper.getBeamByMacs(map);
                }

                for (Map<String, Object> tempAndCloudMap : tempAndCloudList) {
                    String time1 = tempAndCloudMap.get("time").toString();
                    for (Map<String, Object> beamMap : beamList) {

 src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java

@@ -109,11 +109,6 @@
        bmap.put("cityCode", 110000);
        bmap.put("parentCode", 110000);
        hashSet.add(bmap);
        Map<String,Object> kunShanMap=new HashMap<>();
        kunShanMap.put("name1","苏州市");
        kunShanMap.put("parentName","江苏省");
        kunShanMap.put("cityCode",320500);
        hashSet.add(kunShanMap);

        List<Element> elements = Dom4jUtils.readDocument();
        String cityID = "101190404";