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 | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 4f5766c..04e408d 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -25,13 +25,13 @@
THEN (ATAN(AVG(json->'$.e18[0]'*SIN((json->'$.e23[0]'/180)*PI()))/AVG(json->'$.e18[0]'*COS((json->'$.e23[0]'/180)*PI())))*180/PI())+180
ELSE (ATAN(AVG(json->'$.e18[0]'*SIN((json->'$.e23[0]'/180)*PI()))/AVG(json->'$.e18[0]'*COS((json->'$.e23[0]'/180)*PI())))*180/PI())+360
END),3) AS '${sensorKey}',
- ROUND(MIN(json->'$.${sensorKey}[1]'),3) AS 'MIN${sensorKey}',
- ROUND(MAX(json->'$.${sensorKey}[2]'),3) AS 'MAX${sensorKey}'
+ MIN(json->'$.${sensorKey}[1]') AS 'MIN${sensorKey}',
+ MAX(json->'$.${sensorKey}[2]') AS 'MAX${sensorKey}'
</when>
<otherwise>
- ROUND(AVG(json->'$.${sensorKey}[0]'),3) AS 'AVG${sensorKey}',
- ROUND(MIN(json->'$.${sensorKey}[1]'),3) AS 'MIN${sensorKey}',
- ROUND(MAX(json->'$.${sensorKey}[2]'),3) AS '${sensorKey}'
+ AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}',
+ MIN(json->'$.${sensorKey}[1]') AS 'MIN${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