From adde1ed1a99622c80a95dea83e294711d295c55c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 08 Sep 2020 14:46:43 +0800
Subject: [PATCH] 微型站5分钟与半小时数据
---
src/main/resources/mapper/HistoryMapper.xml | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 0ab705d..4ed149c 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,9 @@
ORDER BY `time`
</select>
+ <select id="getJsonData" resultType="java.lang.String">
+ select `json` from ${table}
+ where time = #{time} and mac = #{mac}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0