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 | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index fe8287c..6aedbcb 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/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>
--
Gitblit v1.8.0