From e36d33b5789cc098898af42fdce6cab057db3cc6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 06 Aug 2020 16:33:57 +0800
Subject: [PATCH] update

---
 src/main/resources/mapper/HistoryHourlyMapper.xml |   67 ++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 8f5404c..aa83d96 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -10,10 +10,10 @@
         history_hourly
         <where>
             <if test="mac!=null">
-                AND mac=#{mac}
+                AND mac = #{mac}
             </if>
             <if test="time!=null">
-                AND time= DATE_SUB(#{time}, INTERVAL 1 HOUR)
+                AND time = DATE_SUB(#{time}, INTERVAL 1 HOUR)
             </if>
         </where>
     </select>
@@ -25,35 +25,56 @@
             AVG(h.value ->'$.${sensorKey}') AS '${sensorKey}'
         </foreach>
         FROM
-        history h
-        <where>
-            <if test="mac!=null">
-                and h.mac=#{mac}
-            </if>
-        </where>
+        <if test="mac!=null and time!=null">
+            (select mac,value,time,version from history
+            where mac = #{mac} and time BETWEEN DATE_SUB(#{time}, INTERVAL 1 HOUR) and #{time}) h
+        </if>
         GROUP BY
         DATE_FORMAT(time,'%Y-%m-%d %H')
         <if test="time!=null">
-        having time=DATE_FORMAT(DATE_SUB(#{time}, INTERVAL 1 HOUR),'%Y-%m-%d %H')
+            having time = DATE_FORMAT(DATE_SUB(#{time}, INTERVAL 1 HOUR),'%Y-%m-%d %H')
         </if>
     </select>
 
     <select id="getPollutionSourceDataAll" resultType="java.util.Map">
-    SELECT
-    DATE_FORMAT(time,'%Y-%m-%d %H') time,
-    <foreach collection="sensorKeys" separator="," item="sensorKey">
-        AVG(h.value ->'$.${sensorKey}') AS '${sensorKey}'
-    </foreach>
-    FROM
-    history h
-    <where>
+        SELECT
+        DATE_FORMAT(time,'%Y-%m-%d %H') time,
+        <foreach collection="sensorKeys" separator="," item="sensorKey">
+            AVG(h.value ->'$.${sensorKey}') AS '${sensorKey}'
+        </foreach>
+        FROM
         <if test="mac!=null">
-            and h.mac=#{mac}
+            (select mac,value,time,version from history
+            where mac = #{mac} and time BETWEEN DATE_SUB(#{time}, INTERVAL 1 DAY) and #{time}) h
         </if>
-    </where>
-    GROUP BY
-    DATE_FORMAT(time,'%Y-%m-%d %H')
-    order by time desc
-    limit 0,1
+        GROUP BY
+        DATE_FORMAT(time,'%Y-%m-%d %H')
+        order by time desc
+        limit 0,1
+    </select>
+
+    <select id="getTVOCByMac" resultType="java.lang.String">
+        select json->'$.${sensor}[0]' as e17 from history_hourly where mac=#{mac} and time=#{time}
+    </select>
+
+    <select id="getPressureByMac" resultType="java.lang.String">
+        select json->'$.e28[0]' as e28 from history_hourly where mac=#{mac} and time=#{time}
+    </select>
+
+    <select id="getDataByMac" resultType="java.util.Map">
+        select json  from history_hourly where mac=#{mac} and time=#{time}
+    </select>
+
+    <select id="getBeamByMacs" resultType="java.util.Map">
+        SELECT
+        DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s') time,
+        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>
+        and h.time >= #{start}
+        AND h.time <![CDATA[<]]> #{end}
+        and h.json->'$.e12[0]' is not null
+        group by DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s')
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0