From 21bc39e477ebf9421378aed76062e2be1f1e7f9e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 19 Jun 2020 10:26:30 +0800
Subject: [PATCH] 无人机落点,污染源通道,溯源应用

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

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 0ab705d..05c8a4c 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,

--
Gitblit v1.8.0