From 9a3d7f190717a6e3af608ffa0d78c66b6bcc0e8a Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 10 Sep 2020 15:23:07 +0800
Subject: [PATCH] 因子对比
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index aa83d96..e57f1c8 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -67,7 +67,7 @@
<select id="getBeamByMacs" resultType="java.util.Map">
SELECT
- DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s') time,
+ DATE_FORMAT(h.time,#{typeFormat}) time,
avg(h.json->'$.e12[0]') beam
FROM history_hourly h
WHERE h.mac in
@@ -77,4 +77,28 @@
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>
+
+ <select id="getTVOCByMacs" resultType="java.util.Map">
+ SELECT
+ DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s') time,
+ avg(h.json->'$.e17[0]') 'TVOC'
+ FROM history_hourly h
+ WHERE h.mac in
+ <foreach item="item" collection="macs" index="index" open="(" separator="," close=")">#{item}</foreach>
+ and h.time >= #{start}
+ AND h.time <![CDATA[<]]> #{end}
+ and h.json->'$.e17[0]' is not null
+ group by h.time
+ </select>
+ <select id="getDataByMacAndTime" resultType="java.util.Map">
+ SELECT DATE_FORMAT(`time`,'%Y-%m-%d %H:%i:%s') as `time`,json->'$.${sensor}[0]' as ${sensor} FROM `history_hourly` where `mac`=#{mac} and `time`>=#{startTime} and `time`<#{endTime}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0