ZhuDongming
2019-08-19 f1374915909bb5bddb8d3a7fad84b3955fd69778
合并sql
1 files modified
41 ■■■■■ changed files
src/main/resources/mapper/HistoryMinutelyMapper.xml 41 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -141,7 +141,9 @@
        SELECT
        DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
        <foreach collection="sensorKeys" item="sensorKey" separator=",">
            hm.json->'$.${sensorKey}[0]' as '${sensorKey}'
            hm.json->'$.${sensorKey}[0]' as '${sensorKey}',
            hm.json->'$.${sensorKey}[1]' as 'min${sensorKey}',
            hm.json->'$.${sensorKey}[2]' as 'max${sensorKey}'
        </foreach>
        FROM
        history_minutely as hm
@@ -156,41 +158,4 @@
        hm.time
    </select>
    <select id="getSensorDataMin" resultType="java.util.LinkedHashMap">
        SELECT
        DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
        <foreach collection="sensorKeys" item="sensorKey" separator=",">
            hm.json->'$.${sensorKey}[1]' as '${sensorKey}'
        </foreach>
        FROM
        history_minutely as hm
        <where>
            <if test="mac!=null">
                and hm.mac=#{mac}
            </if>
            and hm.time >= #{startTime}
            and hm.time <![CDATA[<=]]> #{endTime}
        </where>
        ORDER BY
        hm.time
    </select>
    <select id="getSensorDataMax" resultType="java.util.LinkedHashMap">
        SELECT
        DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
        <foreach collection="sensorKeys" item="sensorKey" separator=",">
            hm.json->'$.${sensorKey}[2]' as '${sensorKey}'
        </foreach>
        FROM
        history_minutely as hm
        <where>
            <if test="mac!=null">
                and hm.mac=#{mac}
            </if>
            and hm.time >= #{startTime}
            and hm.time <![CDATA[<=]]> #{endTime}
        </where>
        ORDER BY
        hm.time
    </select>
</mapper>