update

jinpengyong

2020-08-28 186ec9dcec258b3cead27c6874a828b9f48e1c8b

update

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

@@ -653,6 +653,14 @@
        if (nowHour < 8) {

            return resultList;

        }



        if (nowMinute >= 46) {

            nowHour = nowHour + 1;

            cal.setTime(now);

            cal.add(Calendar.HOUR_OF_DAY,1);

            format=sdf1.format(cal.getTime()).substring(0, 13) + ":00:00";

        }



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

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

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

@@ -670,46 +678,23 @@
                        rhour = 24;

                    }



                    if (nowMinute >= 46) {

                        if (rhour == nowHour+1) {

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

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

                            resultMap.put("goodValue", v);

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

                            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)));

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

                            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 + 4) {

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

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

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

                        }

                    }else {

                        if (rhour == nowHour) {

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

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

                            resultMap.put("goodValue", v);

                        } 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)));

                        } 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;

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

                        }

                    if (rhour == nowHour) {

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

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

                        resultMap.put("goodValue", v);

                    } 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)));

                    } 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;

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

                    }







                }

            }

            if (resultMap.get("O3C_8H") != null && !resultMap.get("O3C_8H").equals("")) {