From d8310f6bc609440fa352c0e5a9436c7c78caa287 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 29 Nov 2021 11:09:48 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job

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

diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index f9a4473..169573f 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -96,4 +96,18 @@
         group by h.time
     </select>
 
+    <select id="selectCountByMac" resultType="java.lang.Integer">
+        SELECT count(1) FROM history_hourly
+        WHERE mac = #{mac}
+        AND `time` >= #{start}
+        AND `time` <![CDATA[<]]> #{end}
+    </select>
+
+    <select id="selectDataByMac" resultType="java.lang.String">
+        select
+        json
+        from history_hourly
+        where mac = #{mac}
+        and `time` = #{time}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0