更新获取风向和设备信息，添加经纬度，修改rabbit MQ代码。

kaiyu

2020-09-28 a13506f193f38720ae2729f9c2ceb35bf9fdb898

 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -268,4 +268,34 @@
        order by rs.monitorPointName
    </select>

    <select id="get5MiutesOrHalfHourByDay" resultType="java.util.LinkedHashMap">
        SELECT
        <foreach collection="sensorKeys" separator="," item="sensorKey">
            AVG(h.json->'$.${sensorKey}[0]') AS '${sensorKey}'
        </foreach>
        FROM
        history_${timeUnits} h inner join
        (select mac from device where monitor_point_id in
            (
            select id from monitor_point
            where
            <if test="areaCode != null">
                area_code = #{areaCode}
            </if>

            <if test="cityCode != null">
                city_code = #{cityCode}
            </if>

            <if test="provinceCode != null">
                province_code = #{provinceCode}
            </if>
            )
        and is_delete=0) m
        on h.mac=m.mac
        and h.time>=#{start}
        and h.time <![CDATA[<]]> #{end}
        ORDER BY
        h.time
    </select>
</mapper>