预测数据中加入经纬度字段

jinpengyong

2020-08-20 22eb0d07b7230bfdb9542a3d6d24d5163b14c5ac

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

@@ -454,14 +454,6 @@
            hashMap.put("end", endTime);

            Map<String, Object> O3Map = hangzhouAqiMapper.getAvgO3EightHours(hashMap);

            map.put("O3C_8H", O3Map.get("O3C_8H").toString());

            /*Double O3C_8H = Double.valueOf(O3Map.get("O3C_8H").toString());

            map.put("O3C_8H", String.valueOf(Math.round(O3C_8H)));

            Double PM25 = Double.valueOf(map.get("PM2_5").toString());

            map.put("PM2_5", String.valueOf(Math.round(PM25)));

            Double PM10 = Double.valueOf(map.get("PM10").toString());

            map.put("PM10", String.valueOf(Math.round(PM10)));

            Double O3 = Double.valueOf(map.get("O3").toString());

            map.put("O3", String.valueOf(Math.round(O3)));*/

        }

        //光照

        Map<String, Object> params = new HashMap<>();

@@ -664,7 +656,7 @@
        }

        for (Map<String, Object> resultMap : resultList) {

            if (resultMap.get("type").equals("实测")) {

                if (sdf.parse(time).getTime()==sdf.parse(sdf.format(now)).getTime()) {

                if (sdf.parse(time).getTime() == sdf.parse(sdf.format(now)).getTime()) {

                    String rtime = resultMap.get("time").toString() + ":00";

                    int rhour = Integer.valueOf(rtime.substring(11, 13));

                    cal.setTime(sdf1.parse(rtime));

@@ -682,14 +674,14 @@
                    } else if (rhour == nowHour + 1) {

                        Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);

                        double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 2;

                        resultMap.put("goodValue",String.valueOf(Math.round(v)));

                        resultMap.put("goodValue", String.valueOf(Math.round(v)));

                    } else if (rhour == nowHour + 2) {

                        Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);

                        double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 3;

                        resultMap.put("goodValue", String.valueOf(Math.round(v)));

                    } else if (rhour == nowHour + 3) {

                        Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);

                        double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString()) / 4);

                        double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 4;

                        resultMap.put("goodValue", String.valueOf(Math.round(v)));

                    }

                }

@@ -714,6 +706,19 @@
                resultMap.put("O3C", String.valueOf(Math.round(O3C)));

            }

        }



        for (Map<String, Object> map : resultList) {

            if (map.get("type").equals("预测")) {

                if (resultList.get(1).get("longitude") != null) {

                    String longitude = resultList.get(1).get("longitude").toString();

                    map.put("longitude",longitude);

                }

                if (resultList.get(1).get("latitude") != null) {

                    String latitude = resultList.get(1).get("latitude").toString();

                    map.put("latitude",latitude);

                }

            }

        }

        return resultList;

    }