Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job

kaiyu

2020-11-20 995a527d6e7d2d0cb141f6853b2b7a2a67b8a1c2

 src/main/resources/mapper/AQIMapper.xml

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.mapper.AQIMapper">
    <cache/>

    <select id="getCityAqiConfig" resultType="java.util.LinkedHashMap">
        select * from city_aqi_config;
    </select>
@@ -18,8 +20,31 @@
        ifnull(aqi_json->'$.O3C',aqi_json->'$.O3') 'O3'
        from hangzhou_aqi
        where city_code=#{cityCode}
        and time >= #{startTime}
        AND time <![CDATA[<]]> #{endTime}
         and DATE_FORMAT(time, #{typeFormat}) like '%${time}'
        and DATE_FORMAT(time, #{typeFormat}) in
        <foreach collection="times" open="(" separator="," close=")" item="time">
            #{time}
        </foreach>
    </select>

    <select id="getO3ByTime" resultType="java.lang.String" useCache="true">
        select ifnull(aqi_json->'$.O3C',aqi_json->'$.O3') as 'O3'
        from hangzhou_aqi
        where city_code=#{cityCode}
        and DATE_FORMAT(time, #{typeFormat})=#{time}
    </select>

    <select id="getAqiByHour" resultType="java.util.Map">
        select DATE_FORMAT(time, '%Y-%m-%d %H:%i:%s') time,
        value
        from history_aqi_${timeUnits}
        where city_code=#{cityCode}
        and DATE_FORMAT(time, '%Y%H')=#{yearAndHour}
    </select>

    <select id="getO3FromHistory" resultType="java.lang.String" useCache="true">
        select value ->'$.O3C' as 'O3'
        from history_aqi_${timeUnits}
        where city_code=#{cityCode}
        and DATE_FORMAT(time, #{typeFormat})=#{time}
    </select>
</mapper>