update

jinpengyong

2020-08-05 6956fffa1f06b01375081689c5da5a23a30963db

update

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

@@ -346,10 +346,10 @@
            } else {

                String s = sdf1.format(now).split(" ")[1].split(":")[0];

                Integer hour = Integer.valueOf(s);

                if (hour > 7) {

                    hashMap.put("fxTime", (format + " 07:00").substring(5, 16));

                } else if (hour > 3 && hour < 7) {

                if (hour > 15) {

                    hashMap.put("fxTime", (format + " 15:00").substring(5, 16));

                } else if (hour > 7 && hour < 15) {

                    hashMap.put("fxTime", (format + " 07:00").substring(5, 16));

                }

            }

            Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(map.get("json").toString());

@@ -437,6 +437,7 @@
            beamList = historyHourlyMapper.getBeamByMacs(parameters);

        }





        List<Map<String, Object>> realList = realWeatherMapper.getRealWeather(parameters);

        List<Map<String, Object>> realWeatherList = new ArrayList<>();

        for (Map<String, Object> realMap : realList) {

@@ -451,7 +452,7 @@
        for (Map<String, Object> realMap : realWeatherList) {

            String rtime = realMap.get("time").toString();

            for (Map<String, Object> beamMap : beamList) {

                String btime = realMap.get("time").toString();

                String btime = beamMap.get("time").toString();

                if (btime.equals(rtime)) {

                    realMap.put("beam", beamMap.get("beam").toString());

                }