From 8a4fccc993cbef14b83443d91e51e9b74664eab5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 10 Aug 2020 11:18:46 +0800
Subject: [PATCH] update
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index fc16813..ad65123 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -68,7 +68,7 @@
<select id="getBeamByMacs" resultType="java.util.Map">
SELECT
DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s') time,
- round(avg(h.json->'$.e12[0]'),0) beam
+ avg(h.json->'$.e12[0]') beam
FROM history_hourly h
WHERE h.mac in
<foreach item="item" collection="macs" index="index" open="(" separator="," close=")">#{item}</foreach>
@@ -77,4 +77,12 @@
and h.json->'$.e12[0]' is not null
group by DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s')
</select>
+
+ <!-- ������������mac������������������������������������������������������ -->
+ <select id="getDataByTimeSlot" resultType="java.util.Map">
+ SELECT *
+ FROM history_hourly
+ where mac=#{mac}
+ AND time between #{startTime} and #{endTime}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0