ZhuDongming
2020-04-14 954cc0fbfdf943c2a26c30ac828f302b0f586133
update mac变为name
1 files modified
11 ■■■■■ changed files
src/main/resources/mapper/HistoryMinutelyMapper.xml 11 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -181,22 +181,25 @@
    <select id="getDevicesAvgDataToExcel" resultType="java.util.Map">
        SELECT
        h.mac,DATE_FORMAT(time, #{typeFormat}) time,
        d.name,DATE_FORMAT(time, #{typeFormat}) time,
        <foreach collection="sensorKeys" separator="," item="sensorKey">
            AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
        </foreach>
        FROM
        history_${timeUnits} h
        history_${timeUnits} h,
        device d
        WHERE
        h.mac=d.mac
        AND
        h.time >= #{start}
        AND h.time <![CDATA[<=]]> #{end}
        AND    h.mac in
        AND h.mac in
        <foreach collection="macs" open="(" separator="," close=")"
                 item="mac">
            #{mac}
        </foreach>
        GROUP BY
        h.mac,DATE_FORMAT(time, #{typeFormat})
        h.mac,d.name,DATE_FORMAT(time, #{typeFormat})
        ORDER BY
        h.mac
    </select>