From e51e2d053b498e236097bcb4012c8446d672be86 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 19 May 2020 16:35:46 +0800
Subject: [PATCH] 设备版本添加大屏界面控制
---
src/main/resources/mapper/HistoryMapper.xml | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 4bfc446..a9ce061 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -183,7 +183,7 @@
history h
<where>
<if test="mac!=null">
- and h.mac=#{mac}
+ and h.mac = #{mac}
</if>
and h.time >= #{startTime}
and h.time <![CDATA[<=]]> #{endTime}
@@ -193,21 +193,21 @@
ORDER BY
time
</select>
-
+
<select id="getAVGSensorRankByMonitorPointIdList" resultType="java.util.Map">
- SELECT mp.name, AVG(JSON_EXTRACT(h.value,'$.${sensor}[0]')) sensor
- FROM device d, history h, monitor_point mp
- WHERE d.mac=h.mac
- And mp.id=d.monitor_point_id
- AND d.monitor_point_id IN
- <foreach collection="monitorPointIdList" index="index" item="monitorPointId" open="(" separator="," close=")">
- #{monitorPointId}
- </foreach>
- AND h.time BETWEEN #{before5Time} AND #{endTime}
- GROUP BY d.monitor_point_id
- ORDER BY AVG(JSON_EXTRACT(h.value,'$.${sensor}[0]')) DESC
+ SELECT mp.name, AVG(JSON_EXTRACT(h.value,'$.${sensor}[0]')) sensor
+ FROM device d, history h, monitor_point mp
+ WHERE d.mac=h.mac
+ And mp.id=d.monitor_point_id
+ AND d.monitor_point_id IN
+ <foreach collection="monitorPointIdList" index="index" item="monitorPointId" open="(" separator="," close=")">
+ #{monitorPointId}
+ </foreach>
+ AND h.time BETWEEN #{before5Time} AND #{endTime}
+ GROUP BY d.monitor_point_id
+ ORDER BY AVG(JSON_EXTRACT(h.value,'$.${sensor}[0]')) DESC
</select>
-
+
<select id="getMonitorPointAVGValueByMonitorPointIdAndTimeslot" 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 device d,history h
@@ -227,7 +227,26 @@
history_special as h
<where>
<if test="mac!=null">
- and h.mac=#{mac}
+ and h.mac = #{mac}
+ </if>
+ and h.time >= #{startTime}
+ and h.time <![CDATA[<]]> #{endTime}
+ </where>
+ ORDER BY
+ h.time
+ </select>
+
+ <select id="listGetSensorData" resultType="java.util.LinkedHashMap">
+ SELECT
+ DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s') time,
+ <foreach collection="sensorKeys" item="sensorKey" separator=",">
+ h.value->'$.${sensorKey}' as '${sensorKey}'
+ </foreach>
+ FROM
+ history as h
+ <where>
+ <if test="mac!=null">
+ and h.mac = #{mac}
</if>
and h.time >= #{startTime}
and h.time <![CDATA[<]]> #{endTime}
--
Gitblit v1.8.0