From fc1e6566611aa9f4311272aeb0e2da1d03d6c9bd Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 11:30:42 +0800
Subject: [PATCH] 风场更新

---
 src/main/resources/mapper/HistoryMapper.xml |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 0ab705d..8a44f87 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -236,6 +236,26 @@
         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}
+        </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,
@@ -258,6 +278,7 @@
     <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
@@ -267,4 +288,20 @@
          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
+		where  mac = #{mac} and time &gt;= #{time1} and time &lt;=#{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