From d3c5982218db1413c8f609f1f51b49c49a2db496 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 21 Oct 2020 17:19:58 +0800
Subject: [PATCH] 大屏多设备数据报表接口

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

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 05c8a4c..8af3236 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
@@ -287,4 +288,14 @@
          ORDER BY `time`
     </select>
 
+    <select id="getJsonData" resultType="java.lang.String">
+        select `json` from ${table}
+		where  time = #{time} and mac = #{mac}
+    </select>
+    <select id="getValueByMacAndTime" resultType="java.lang.String">
+        select `value` from history
+		where  mac = #{mac} and time &gt;= #{time1} and time &lt;=#{time}
+        limit 0,1
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0