From 69a3e436bedfc828930e08cbbac7df57f4fd83cb Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 12 Jun 2020 16:46:03 +0800
Subject: [PATCH] update去除站点层,更改设备图标为站点图标

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

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index a9ce061..0ab705d 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -255,4 +255,16 @@
         h.time
     </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