update,大屏O3预测

jinpengyong

2020-08-07 6919ec8dbbbc9338cbc6b5bc1c43ba0d14d5634b

update,大屏O3预测

 src/main/java/com/moral/controller/ScreenController.java

@@ -1964,7 +1964,6 @@
            @ApiImplicitParam(name = "time", value = "时间(格式：2020-03-19)", required = true, paramType = "query", dataType = "String")})
    public ResultBean<List<Map<String, Object>>> getWeatherNextDayDataByRegion(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");
        List<Map<String, Object>> resultList = weatherService.getForecastAndReal(parameters);
        return new ResultBean<List<Map<String, Object>>>(resultList);
    }
@@ -1976,7 +1975,6 @@
            @ApiImplicitParam(name = "time", value = "时间(格式：2020-03-19)", required = true, paramType = "query", dataType = "String")})
    public ResultBean<List<Map<String, Object>>> getWeatherData(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");
        List<Map<String, Object>> weatherList = weatherService.getWeatherData(parameters);
        return new ResultBean<List<Map<String, Object>>>(weatherList);
    }
@@ -2088,4 +2086,5 @@
        }
        return new ResultBean<List<Map<String, Object>>>(list);
    }

}

 src/main/java/com/moral/entity/ForecastWeather.java

@@ -9,7 +9,7 @@
@Data
public class ForecastWeather {
    @Id
    private Integer monitorPointId;
    private String cityCode;

    private Date time;


 src/main/java/com/moral/entity/RealWeather.java

@@ -9,7 +9,7 @@
@Data
public class RealWeather {
    @Id
    private Integer monitorPointId;
    private String cityCode;

    private Date time;


 src/main/java/com/moral/mapper/AreaMapper.java

@@ -1,5 +1,7 @@
package com.moral.mapper;

import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.moral.common.mapper.BaseMapper;
@@ -9,4 +11,5 @@

    Area getAreaByName(@Param(value="name") String name);

    List<Area> getAreaByCityCode(@Param(value="cityCode") Integer cityCode);
}

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

@@ -176,6 +176,7 @@


    @Override

    public List<Map<String, Object>> getForecastAndReal(Map<String, Object> parameters) throws ParseException {

        parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");

        String monitorPointId = parameters.get("monitorPointId").toString();

        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

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

@@ -187,17 +188,20 @@
        String nextDay = sdf.format(c.getTime());

        parameters.put("start", sdf.parse(time));

        parameters.put("end", sdf.parse(nextDay));

        List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecastHour(parameters);

        MonitorPoint monitorPoint = monitorPointMapper.selectByPrimaryKey(Integer.valueOf(monitorPointId));

        parameters.put("areaCode", monitorPoint.getAreaCode());

        String sensors = "O3C";

        String sensor1 = "O3";

        parameters.put("sensors", sensors);

        parameters.put("sensors1", sensor1);

        parameters.put("sensors2", sensor1);



        //List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecastHour(parameters);



        if (monitorPoint.getAreaCode() == null) {

            parameters.put("cityCode", monitorPoint.getCityCode());

        } else {

            parameters.put("cityCode", monitorPoint.getAreaCode());

        }

        List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);

        List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecastHour(parameters);



        if (aqiList.size() == 0) {

            parameters.put("areaCode", monitorPoint.getCityCode());

            parameters.put("cityCode", monitorPoint.getCityCode());

            aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);

        }

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

@@ -218,7 +222,7 @@
                }

                map.put("time", Integer.valueOf(hour));

                values.add("");

                values.add(aqiMap.get(sensor1).toString());

                values.add(aqiMap.get("O3").toString());

                map.put("values", values);

                resultList.add(map);

            }

@@ -257,7 +261,7 @@
                }

                for (Map<String, Object> aqiMap : aqiList) {

                    if (forecastMap.get("time").equals(aqiMap.get("time"))) {

                        values.add(aqiMap.get(sensor1).toString());

                        values.add(aqiMap.get("O3").toString());

                    }

                }

                map.put("values", values);

@@ -275,59 +279,69 @@


    @Override

    public List<Map<String, Object>> getWeatherData(Map<String, Object> parameters) throws ParseException {

        parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");

        String cityName = parameters.get("city").toString();

        Area area = areaMapper.getAreaByName(cityName);

        MonitorPoint monitorPoint;

        Integer areaCode = 0;

        Integer cityCode = 0;

        Integer parentCode = 0;

        Integer code = 0;

        String name = "";

        if (area == null) {

            City city = cityMapper.getCityByName(cityName);

            if (city == null) {

                Province province = provinceMapper.getProvinceByName(cityName);

                Integer provinceCode = province.getProvinceCode();

                monitorPoint = monitorPointMapper.getFirstMonitorPointByProvinceCode(provinceCode);

                parameters.put("areaCode", provinceCode);

                parameters.put("city", province.getProvinceName());

                code = province.getProvinceCode();

                name = province.getProvinceName();

            } else {

                cityCode = city.getCityCode();

                monitorPoint = monitorPointMapper.getFirstMonitorPointByCityCode(cityCode);

                parameters.put("areaCode", cityCode);

                parameters.put("city", city.getCityName());

                code = city.getCityCode();

                parentCode = city.getProvinceCode();

                name = city.getCityName();

            }

        } else {

            areaCode = area.getAreaCode();

            monitorPoint = monitorPointMapper.getFirstMonitorPointByAreaCode(areaCode);

            cityCode = area.getCityCode();

            parameters.put("areaCode", areaCode);

            parameters.put("city", area.getAreaName());

            code = area.getAreaCode();

            parentCode = area.getCityCode();

            name = area.getAreaName();

        }

        if (monitorPoint == null) {

            return new ArrayList<>();

        }

        parameters.put("monitorPointId", monitorPoint.getId());



        parameters.put("cityCode", code);

        parameters.put("name", name);

        parameters.put("areaCode", code);





        String time = parameters.get("time").toString();

        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        Date now = new Date();

        Date selectTime = sdf1.parse(time + " 00:00:00");

        Calendar c1 = Calendar.getInstance();

        c1.setTime(selectTime);

        c1.add(Calendar.DAY_OF_MONTH, -1);

        Date beforeDay = c1.getTime();

        String format = sdf.format(beforeDay);

        Calendar c = Calendar.getInstance();

        c.setTime(sdf.parse(time));

        c.add(Calendar.HOUR_OF_DAY, 1);

        Date start = c.getTime();

        c.add(Calendar.DAY_OF_MONTH, 1);

        Date end = c.getTime();

        parameters.put("start", start);

        Date selectTime = sdf1.parse(time + " 01:00:00");

        Calendar cal = Calendar.getInstance();

        cal.setTime(selectTime);

        cal.add(Calendar.DAY_OF_MONTH, 1);

        Date end = cal.getTime();

        cal.setTime(sdf.parse(time));

        cal.add(Calendar.DAY_OF_MONTH, -1);

        String beforeDay = sdf.format(cal.getTime());

        parameters.put("start", selectTime);

        parameters.put("end", end);

        List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecast(parameters);

        if (forecastList.size() == 0) {

            parameters.put("cityCode", parentCode);

            forecastList = forecastWeatherMapper.getForecast(parameters);

            if (forecastList.size() == 0) {

                List<Area> areaList = areaMapper.getAreaByCityCode(code);

                for (Area area1 : areaList) {

                    parameters.put("cityCode", area1.getAreaCode());

                    forecastList = forecastWeatherMapper.getForecast(parameters);

                    if (forecastList.size() != 0) {

                        break;

                    }

                }

            }

        }



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

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

        for (Map<String, Object> forecastMap : forecastList) {

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

            hashMap.put("time", map.get("time").toString());

            hashMap.put("time", forecastMap.get("time").toString());

            hashMap.put("type", "预测");

            hashMap.put("TVOC", "");

            hashMap.put("altitude", "");

@@ -339,37 +353,36 @@
            hashMap.put("O3C", "");

            hashMap.put("PM25C", "");

            hashMap.put("PM10C", "");

            hashMap.put("city", parameters.get("city").toString());



            if (selectTime.getTime() <= now.getTime()) {

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

            hashMap.put("city", parameters.get("name").toString());

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

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

            } else {

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

                Integer hour = Integer.valueOf(s);

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

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

                Date date1 = sdf1.parse(format + " 07:00:00");

                Date date2 = sdf1.parse(format + " 15:00:00");

                if (now.getTime() > date2.getTime()) {

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

                } else if (now.getTime() > date1.getTime() && (now.getTime() < date2.getTime() || now.getTime() == date2.getTime())) {

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

                }

            }

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

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

            hashMap.putAll(jsonMap);

            foreList.add(hashMap);

        }



        for (Map<String, Object> foreMap : foreList) {

            String ftime = foreMap.get("time").toString();

            Calendar calendar = Calendar.getInstance();

            Date endTime = sdf1.parse(ftime);

            calendar.setTime(endTime);

            calendar.add(Calendar.HOUR, -6);

            Date startTime = calendar.getTime();

            cal.setTime(endTime);

            cal.add(Calendar.HOUR, -6);

            Date startTime = cal.getTime();

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

            hashMap.put("areaCode", Integer.valueOf(parameters.get("areaCode").toString()));

            hashMap.put("start", startTime);

            hashMap.put("end", endTime);

            hashMap.put("monitorPointId", Integer.valueOf(parameters.get("monitorPointId").toString()));

            hashMap.put("cityCode", Integer.valueOf(parameters.get("cityCode").toString()));

            Map<String, Object> precip6HourMap = forecastWeatherMapper.getPrecip6Hour(hashMap);

            foreMap.put("precip6", "");

            if (precip6HourMap != null) {

                foreMap.put("precip6", precip6HourMap.get("precip6").toString());

            }

@@ -377,7 +390,7 @@


        List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqi(parameters);

        if (aqiList.size() == 0) {

            parameters.put("areaCode", cityCode);

            parameters.put("areaCode", parentCode);

            aqiList = hangzhouAqiMapper.getAqi(parameters);

        }



@@ -387,15 +400,15 @@
            hashMap.put("time", aqiMap.get("time"));

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

            hashMap.putAll(jsonMap);

            hashMap.put("city", parameters.get("city").toString());

            hashMap.put("city", parameters.get("name").toString());

            realAqilist.add(hashMap);

        }



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

            Date endTime = sdf1.parse(map.get("time").toString());

            c.setTime(endTime);

            c.add(Calendar.HOUR, -8);

            Date startTime = c.getTime();

            cal.setTime(endTime);

            cal.add(Calendar.HOUR, -8);

            Date startTime = cal.getTime();

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

            hashMap.put("areaCode", Integer.valueOf(parameters.get("areaCode").toString()));

            hashMap.put("start", startTime);

@@ -408,14 +421,13 @@
        }



        //光照

        String code = parameters.get("areaCode").toString();

        String ac = parameters.get("areaCode").toString();

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

        if (code.endsWith("00")) {

            params.put("cityCode", Integer.valueOf(code));

        if (ac.endsWith("00")) {

            params.put("cityCode", Integer.valueOf(ac));

        } else {

            params.put("areaCode", Integer.valueOf(code));

            params.put("areaCode", Integer.valueOf(ac));

        }



        List<MonitorPoint> monitorList = monitorPointMapper.getMonitorList(params);



        List<Integer> pointList = new ArrayList<>();

@@ -437,7 +449,6 @@
            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) {

@@ -445,7 +456,7 @@
            hashMap.put("time", realMap.get("time"));

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

            hashMap.putAll(jsonMap);

            hashMap.put("city", parameters.get("city").toString());

            hashMap.put("city", parameters.get("name").toString());

            realWeatherList.add(hashMap);

        }



@@ -454,21 +465,24 @@
            for (Map<String, Object> beamMap : beamList) {

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

                if (btime.equals(rtime)) {

                    realMap.put("beam", beamMap.get("beam").toString().split("\\.")[0]);

                    realMap.put("beam", Math.floor((Double) beamMap.get("beam")));

                }

            }

            Calendar calendar = Calendar.getInstance();



            Date endTime = sdf1.parse(rtime);

            calendar.setTime(endTime);

            calendar.add(Calendar.HOUR, -6);

            Date startTime = calendar.getTime();

            cal.setTime(endTime);

            cal.add(Calendar.HOUR, -6);

            Date startTime = cal.getTime();

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

            hashMap.put("areaCode", Integer.valueOf(parameters.get("areaCode").toString()));

            hashMap.put("cityCode", Integer.valueOf(parameters.get("areaCode").toString()));

            hashMap.put("start", startTime);

            hashMap.put("end", endTime);

            hashMap.put("monitorPointId", Integer.valueOf(parameters.get("monitorPointId").toString()));



            Map<String, Object> precip6HourMap = realWeatherMapper.getPrecip6Hour(hashMap);

            realMap.put("precip6", precip6HourMap.get("precip6").toString());



            if (precip6HourMap != null) {

                realMap.put("precip6", precip6HourMap.get("precip6").toString());

            }

        }



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

@@ -506,13 +520,10 @@
            }

        }





        list.removeAll(Collections.singleton(null));





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

            map.put("type", "实测");

            map.put("city", parameters.get("city").toString());

            map.put("city", parameters.get("name").toString());

        }



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

@@ -559,6 +570,7 @@
        return resultList;

    }





    @Override

    public void updateForecastWeather(Map<String, Object> parameters) {

        List<Integer> list = new ArrayList<>();

@@ -583,18 +595,27 @@
                String time = map.get("time").toString() + ":00";

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

                hashMap.put("time", time);

                String city = map.get("city").toString();

                Area area = areaMapper.getAreaByName(city);

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

                String cityName = map.get("city").toString();

                Area area = areaMapper.getAreaByName(cityName);

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

                if (area == null) {

                    Integer cityCode = cityMapper.getCityByName(city).getCityCode();

                    idMap.put("cityCode", cityCode);

                    City city = cityMapper.getCityByName(cityName);

                    if (city == null) {

                        Province province = provinceMapper.getProvinceByName(cityName);

                        if (province == null) {

                            return;

                        } else {

                            hashMap.put("cityCode", province.getProvinceCode());

                        }

                    } else {

                        Integer cityCode = city.getCityCode();

                        hashMap.put("cityCode", cityCode);

                    }

                } else {

                    Integer areaCode = area.getAreaCode();

                    idMap.put("areaCode", areaCode);

                    hashMap.put("cityCode", areaCode);

                }



                List<MonitorPoint> monitorList = monitorPointMapper.getMonitorList(idMap);

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

                for (String key : map.keySet()) {

                    if (!key.equals("city") && !key.equals("time") && !key.equals("type") && !key.equals("fxTime")) {

@@ -602,13 +623,8 @@
                        jsonMap.put(key, value);

                    }

                }



                String json = JSONObject.toJSONString(jsonMap);

                hashMap.put("json", json);

                for (MonitorPoint monitorPoint : monitorList) {

                    hashMap.put("monitorPointId", monitorPoint.getId());

                    forecastWeatherMapper.updateForecastWeather(hashMap);

                }

                hashMap.put("json", JSONObject.toJSONString(jsonMap));

                forecastWeatherMapper.updateForecastWeather(hashMap);

            }

        }

    }


 src/main/resources/mapper/AreaMapper.xml

@@ -11,4 +11,9 @@
    select * from area
    where area_name like '%${name}%' limit 0,1
  </select>

  <select id="getAreaByCityCode" resultType="com.moral.entity.Area" resultMap="BaseResultMap">
    select * from area
    where city_code=#{cityCode}
  </select>
</mapper>

 src/main/resources/mapper/ForecastWeatherMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.mapper.ForecastWeatherMapper">
    <resultMap id="BaseResultMap" type="com.moral.entity.ForecastWeather">
        <id column="monitor_point_id" property="monitorPointId" jdbcType="INTEGER"/>
        <id column="city_code" property="cityCode" jdbcType="INTEGER"/>
    </resultMap>
    <select id="getForecastHour" resultType="java.util.Map">
        SELECT
@@ -11,7 +11,7 @@
        from forecast_weather
        where time >= #{start}
        AND time <![CDATA[<]]> #{end}
        AND monitor_point_id=#{monitorPointId}
        AND city_code=#{cityCode}
    </select>

    <select id="getForecast" resultType="java.util.Map">
@@ -20,14 +20,14 @@
        from forecast_weather
        where time >= #{start}
        AND time <![CDATA[<]]> #{end}
        AND monitor_point_id=#{monitorPointId}
        AND city_code=#{cityCode}
        ORDER BY
        time
    </select>

    <update id="updateForecastWeather">
        update forecast_weather set json=#{json}
        where monitor_point_id=#{monitorPointId}
        update forecast_weather1 set json=#{json}
        where city_code=#{cityCode}
        and time=#{time}
    </update>

@@ -40,6 +40,6 @@
    WHERE
    time >= #{start}
    AND time <![CDATA[<]]> #{end}
    AND monitor_point_id = #{monitorPointId}
    AND city_code = #{cityCode}
    </select>
</mapper>

 src/main/resources/mapper/HangzhouAqiMapper.xml

@@ -71,13 +71,13 @@
    <select id="getAqiDataByAreaCode" resultType="java.util.Map">
    SELECT
    DATE_FORMAT(time, #{typeFormat}) time,
    ifnull(aqi_json->'$.${sensors}',"") as '${sensors2}'
    ifnull(aqi_json->'$.O3C',"") as 'O3'
    FROM
    hangzhou_aqi ha
    WHERE
    ha.time >= #{start}
    AND ha.time <![CDATA[<]]> #{end}
    AND ha.city_code = #{areaCode}
    AND ha.city_code = #{cityCode}
    ORDER BY
    time
  </select>

 src/main/resources/mapper/RealWeatherMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.mapper.RealWeatherMapper">
    <resultMap id="BaseResultMap" type="com.moral.entity.RealWeather">
        <id column="monitor_point_id" property="monitorPointId" jdbcType="INTEGER"/>
        <id column="city_code" property="cityCode" jdbcType="INTEGER"/>
    </resultMap>
    <select id="getRealWeather" resultType="java.util.Map">
    select
@@ -13,7 +13,7 @@
    WHERE
    time >= #{start}
    AND time <![CDATA[<]]> #{end}
    AND monitor_point_id = #{monitorPointId}
    AND city_code = #{areaCode}
    ORDER BY
    time
   </select>
@@ -26,6 +26,6 @@
    WHERE
    time >= #{start}
    AND time <![CDATA[<]]> #{end}
    AND monitor_point_id = #{monitorPointId}
    AND city_code = #{cityCode}
    </select>
</mapper>