From 27421fc5caadacc138db507bffae56a833555761 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 12 Aug 2020 16:00:30 +0800
Subject: [PATCH] 风场图update
---
src/main/resources/mapper/HistoryMapper.xml | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 603a438..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,
@@ -254,15 +274,17 @@
ORDER BY
h.time
</select>
- <select id="getO3AVG" resultType="java.lang.String">
- select AVG(history_hourly.json->'$.e15[0]')
- FROM history_hourly
- where time <![CDATA[>=]]>#{frontTime}
- and time <![CDATA[<]]>#{afterTime}
- and mac=#{mac}
- </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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0