From bb77c5e3089fc3e9ccb520625b7798d81c99bfa2 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 13:55:15 +0800
Subject: [PATCH] update

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

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 0ab705d..8af3236 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,14 @@
          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>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0