From 99cb5ef3a41cc3bdba2f8c6379fc1dd1e77c82a1 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 13 Aug 2019 11:06:31 +0800
Subject: [PATCH] 修改无人机sql
---
src/main/resources/mapper/HistoryMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 5314b67..0747947 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -143,7 +143,7 @@
<select id="getActualDataByRegion" resultType="java.util.Map">
SELECT
<foreach collection="sensorKeys" separator="," item="sensorKey">
- MAX( CONVERT ( `value` -> '$.${sensorKey}', DECIMAL ) ) AS '${sensorKey}'
+ MAX( `value` ->> '$.${sensorKey}' ) * 1 AS '${sensorKey}'
</foreach>
FROM
history h ,
@@ -162,4 +162,11 @@
AND h.time < #{end}
</where>
</select>
+
+ <select id="getAVGValueByMacAndTimeslot" resultType="java.util.Map">
+ SELECT AVG(JSON_EXTRACT(value,'$.e1[0]')) e1,AVG(JSON_EXTRACT(value,'$.e2[0]')) e2,AVG(JSON_EXTRACT(value,'$.e10[0]')) e10,AVG(JSON_EXTRACT(value,'$.e11[0]')) e11,AVG(JSON_EXTRACT(value,'$.e16[0]')) e16,AVG(JSON_EXTRACT(value,'$.e15[0]')) e15
+ FROM history
+ WHERE mac = #{mac}
+ AND time BETWEEN #{starttime} AND #{endtime}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0