From 4c872cea75d5b3c3832f0f0796ba727e8f91168d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 21 Oct 2020 15:03:50 +0800
Subject: [PATCH] 增加获取单台设备五分钟平均值以及沧州环保局下属设备只显示十个参数

---
 src/main/resources/mapper/HistoryMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index c4ba95d..4ed149c 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -278,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
@@ -286,10 +287,10 @@
          and mac=#{mac}
          ORDER BY `time`
     </select>
+
     <select id="getJsonData" resultType="java.lang.String">
-        	select `json` from ${table}
+        select `json` from ${table}
 		where  time = #{time} and mac = #{mac}
     </select>
-
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0