jinpengyong
2020-09-28 48bb075f91c5daf35cff0a16abe1136f132aafb4
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,20 +193,37 @@
                //风速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)) {
                    condition = "100";
                } else if ("雾".equals(text)) {
                    condition = "90";
                } else if ("多云".equals(text)) {
                    condition = "80";
                } else if ("阴".equals(text)) {
                } else if ("霾".equals(text)) {
                    condition = "70";
                } else if ("阴".equals(text) || "扬沙".equals(text) || "浮尘".equals(text) || "".equals(text)) {
                    condition = "60";
                } else if ("雷阵雨".equals(text) || "阵雨".equals(text)) {
                } else if ("阵雨".equals(text)) {
                    condition = "45";
                } else if ("雷阵雨".equals(text)) {
                    condition = "40";
                } else if ("雷阵雨转小雨".equals(text) || "阵雨转小雨".equals(text)) {
                    condition = "30";
                } else if ("小雨".equals(text)) {
                    condition = "20";
                } else if ("雨".equals(text)) {
                    condition = "10";
                } else if ("雷阵雨转中雨".equals(text)) {
                    condition = "5";
                } else if ("雷阵雨转大雨".equals(text)) {
                    condition = "4";
                } else if ("中雨".equals(text) || "大雨".equals(text) || "暴雨".equals(text)
                        || "小雪".equals(text) || "中雪".equals(text) || "大雪".equals(text)
                        || "雨夹雪".equals(text) || "雨夹雪(伴有冰雹)".equals(text) || "暴雪".equals(text)
                ) {
                    condition = "0";
                } else {
                    condition = "50";
@@ -271,15 +289,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()));
                    O3List = aqiMapper.getO3(map1);
                }
                List<Map<String, Object>> O3List = new ArrayList<>();
                List<Map<String, Object>> beamList = new ArrayList<>();
                if (map.get("macs") != null) {
                    beamList = historyHourlyMapper.getBeamByMacs(map);
                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);
                    }
                }
                for (Map<String, Object> tempAndCloudMap : tempAndCloudList) {
                    String time1 = tempAndCloudMap.get("time").toString();
                    for (Map<String, Object> beamMap : beamList) {