From 1e6dbe352c35a54c299008c523e38b1e59d1ea03 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Fri, 07 Jul 2023 14:01:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa --- screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml index b2cc720..ab17e79 100644 --- a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml +++ b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml @@ -9,6 +9,15 @@ AND `time` = #{time} </select> + + <select id="selectHourlyListData" parameterType="java.util.List" resultType="java.util.Map"> + SELECT `value`,`time` + FROM history_hourly_${timeUnits} + WHERE mac = #{mac} + AND `time` BETWEEN #{startTime} and #{endTime} + </select> + + <select id="selectDataByMacsAndTime" parameterType="java.util.List" resultType="java.util.Map"> select mac, `time`, `value` from history_hourly_${timeUnits} where mac in -- Gitblit v1.8.0