jinpengyong
2020-11-12 824762785fb717317550127684efb4f7b792cc8b
src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -827,21 +827,28 @@
        //地理特征
        Map<String, Object> geographyMap = shAreaMapper.getGeography(name);
        for (Map<String, Object> map : resultList) {
            double longitude = Double.valueOf(geographyMap.get("lng").toString());
            double latitude = Double.valueOf(geographyMap.get("lat").toString());
            map.put("longitude", df.format(longitude));
            map.put("latitude", df.format(latitude));
            if (geographyMap.get("altitude") != null) {
                map.put("altitude", geographyMap.get("altitude").toString());
            }
            if (geographyMap.get("vegetation") != null) {
                map.put("vegetation", geographyMap.get("vegetation").toString());
            }
            if (geographyMap.get("river") != null) {
                map.put("river", geographyMap.get("river").toString());
        if (geographyMap != null) {
            for (Map<String, Object> map : resultList) {
                if (geographyMap.get("lng") != null) {
                    double longitude = Double.valueOf(geographyMap.get("lng").toString());
                    map.put("longitude", df.format(longitude));
                }
                if (geographyMap.get("lat") != null) {
                    double latitude = Double.valueOf(geographyMap.get("lat").toString());
                    map.put("latitude", df.format(latitude));
                }
                if (geographyMap.get("altitude") != null) {
                    map.put("altitude", geographyMap.get("altitude").toString());
                }
                if (geographyMap.get("vegetation") != null) {
                    map.put("vegetation", geographyMap.get("vegetation").toString());
                }
                if (geographyMap.get("river") != null) {
                    map.put("river", geographyMap.get("river").toString());
                }
            }
        }
        for (int i = 0; i < resultList.size(); i = i + 2) {
            Map<String, Object> foreMap = resultList.get(i);
            Map<String, Object> realMap = resultList.get(i + 1);