From f976feb7ae339c006af150b30802f7edfc8d966f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 13 Oct 2023 09:05:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-job/src/main/resources/mapper/HistoryMinutelyMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/screen-job/src/main/resources/mapper/HistoryMinutelyMapper.xml b/screen-job/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 3785bc1..34464fa 100644
--- a/screen-job/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/screen-job/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -27,6 +27,22 @@
</if>
</select>
+ <select id="getHistoryMinutelyMacData" resultType="java.lang.String">
+ SELECT
+ mac
+ FROM
+ history_minutely_${timeUnits}
+ WHERE `time` <![CDATA[>=]]> #{start}
+ AND `time` <![CDATA[<]]> #{end}
+ <if test="macs != null">
+ AND mac IN
+ <foreach collection="macs" item="mac" open="(" close=")" separator=",">
+ #{mac}
+ </foreach>
+ </if>
+ group by mac
+ </select>
+
<select id="getHourlyData" resultType="java.util.Map">
SELECT mac, `time`, `value`
FROM history_minutely_${timeUnits}
--
Gitblit v1.8.0