From d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/HistoryMapper.xml | 104 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 78 insertions(+), 26 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 2a7dfb0..0fd5fcf 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.mapper.HistoryMapper">
<select id="selectValueByMacAndTime" resultType="java.lang.String">
- select `value` from history
+ select `value` from history_${timeUnits}
where time = #{time} and mac = #{mac}
limit 0,1
</select>
@@ -13,10 +13,10 @@
d.`name`,
</if>
<foreach collection="sensorKeys" separator="," item="sensorKey">
- AVG(h.`value` ->'$.${sensorKey}[0]') AS '${sensorKey}'
+ AVG(h.`value` ->'$.${sensorKey}') AS '${sensorKey}'
</foreach>
FROM
- history h,
+ history_${timeUnits} h,
device d,
monitor_point mp
WHERE
@@ -132,7 +132,7 @@
value,
time
FROM
- history
+ history_${timeUnits}
WHERE
mac = #{mac}
ORDER BY
@@ -143,10 +143,10 @@
<select id="getActualDataByRegion" resultType="java.util.Map">
SELECT
<foreach collection="sensorKeys" separator="," item="sensorKey">
- MAX( `value` ->> '$.${sensorKey}' ) * 1 AS '${sensorKey}'
+ MAX( `value` -> '$.${sensorKey}' ) * 1 AS '${sensorKey}'
</foreach>
FROM
- history h ,
+ history_${timeUnits} h ,
device d,
monitor_point mp
<where>
@@ -165,9 +165,10 @@
<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
+ FROM history_${timeUnits}
WHERE mac = #{mac}
- AND time BETWEEN #{starttime} AND #{endtime}
+ AND time >= #{starttime}
+ AND time <![CDATA[<]]> #{endtime}
</select>
<!-- ���������sensor������������ -->
@@ -183,7 +184,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,27 +194,28 @@
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_${timeUnits} 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
+ FROM device d,history_${timeUnits} h
WHERE d.monitor_point_id = #{monitor_point_id}
AND d.mac = h.mac
- AND h.time BETWEEN #{starttime} AND #{endtime}
+ AND h.time >= #{starttime}
+ AND h.time <![CDATA[<]]> #{endtime}
</select>
<!-- ���������sensor������ -->
@@ -227,7 +229,27 @@
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="getUavSensorData" 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_special as h
+ <where>
+ <if test="mac!=null">
+ and h.mac = #{mac}
</if>
and h.time >= #{startTime}
and h.time <![CDATA[<]]> #{endTime}
@@ -246,7 +268,7 @@
history 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}
@@ -255,4 +277,34 @@
h.time
</select>
+ <select id="getNum" resultType="java.lang.Integer">
+ select count(*) from history_hourly where time <![CDATA[>=]]> #{timef} and time <![CDATA[<=]]> #{timea}
+ </select>
+
+ <select id="getO3AVG" resultType="java.util.LinkedHashMap">
+ select DATE_FORMAT(time,'%Y-%m-%d %H:%i:%s') time,json->'$.e15[0]' as e15
+ FROM history_hourly
+ where time <![CDATA[>=]]>#{date}
+ and time <![CDATA[<]]>#{nextDate}
+ and mac=#{mac}
+ ORDER BY `time`
+ </select>
+
+ <select id="getJsonData" resultType="java.lang.String">
+ select `json` from ${table}
+ where time = #{time} and mac = #{mac}
+ </select>
+
+ <select id="getValueByMacAndTime" resultType="java.lang.String">
+ select `value` from history_${timeUnits}
+ where mac = #{mac} and time >= #{time1} and time <=#{time}
+ limit 0,1
+ </select>
+ <select id="getDailyAvgData" resultType="java.util.Map">
+ SELECT AVG(hd.json->"$.e1[0]") as `PM2_5`,AVG(hd.json->"$.e2[0]") as 'PM10',AVG(hd.json->"$.e10[0]") as 'CO',
+ AVG(hd.json->"$.e11[0]") as 'SO2',AVG(hd.json->"$.e16[0]") as 'NO2',AVG(hd.json->"$.e15[0]") as 'O3_day'
+FROM `history_daily` hd,monitor_point mt,device d where mt.id=d.monitor_point_id
+and d.mac=hd.mac and mt.id=#{mId} and time=#{time}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0