From 4108fd24ac888934a23e9b9129c4392baa2ffb94 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 23 Nov 2021 15:27:43 +0800
Subject: [PATCH] 设备掉线,小时和昨日邮件发送

---
 src/main/resources/mapper/HistoryHourlyMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index f64a1fc..04e408d 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -29,9 +29,9 @@
                     MAX(json->'$.${sensorKey}[2]') AS 'MAX${sensorKey}'
                 </when>
                 <otherwise>
-                    AVG(json->'$.${sensorKey}[0]') AS 'AVG${sensorKey}',
+                    AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}',
                     MIN(json->'$.${sensorKey}[1]') AS 'MIN${sensorKey}',
-                    MAX(json->'$.${sensorKey}[2]') AS '${sensorKey}'
+                    MAX(json->'$.${sensorKey}[2]') AS 'MAX${sensorKey}'
                 </otherwise>
             </choose>
         </foreach>
@@ -96,4 +96,10 @@
         group by h.time
     </select>
 
+    <select id="selectCountByMac" resultType="java.lang.Integer">
+        SELECT count(1) FROM history_hourly
+        WHERE mac = #{mac}
+        AND `time` >= #{start}
+        AND `time` <![CDATA[<]]> #{end}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0