From 954cc0fbfdf943c2a26c30ac828f302b0f586133 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 14 Apr 2020 16:14:19 +0800
Subject: [PATCH] update mac变为name
---
src/main/resources/mapper/HistoryMinutelyMapper.xml | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 3c4b0f8..6aedbcb 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -152,7 +152,7 @@
and hm.mac=#{mac}
</if>
and hm.time >= #{startTime}
- and hm.time <![CDATA[<=]]> #{endTime}
+ and hm.time <![CDATA[<]]> #{endTime}
</where>
ORDER BY
hm.time
@@ -173,10 +173,35 @@
and hm.mac=#{mac}
</if>
and hm.time >= #{startTime}
- and hm.time <![CDATA[<=]]> #{endTime}
+ and hm.time <![CDATA[<]]> #{endTime}
</where>
ORDER BY
hm.time
</select>
+ <select id="getDevicesAvgDataToExcel" resultType="java.util.Map">
+ SELECT
+ d.name,DATE_FORMAT(time, #{typeFormat}) time,
+ <foreach collection="sensorKeys" separator="," item="sensorKey">
+ AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
+ </foreach>
+ FROM
+ history_${timeUnits} h,
+ device d
+ WHERE
+ h.mac=d.mac
+ AND
+ h.time >= #{start}
+ AND h.time <![CDATA[<=]]> #{end}
+ AND h.mac in
+ <foreach collection="macs" open="(" separator="," close=")"
+ item="mac">
+ #{mac}
+ </foreach>
+ GROUP BY
+ h.mac,d.name,DATE_FORMAT(time, #{typeFormat})
+ ORDER BY
+ h.mac
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0