From bb6856a82a588f05040b0410a9747ae8029bb3be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 10:06:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
index 40ac177..6818460 100644
--- a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -40,6 +40,12 @@
FROM history_hourly_${timeUnits}
WHERE `time` <![CDATA[>=]]> #{start}
AND `time` <![CDATA[<]]> #{end}
+ <if test="list != null and list.size()!=0">
+ and mac in
+ <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
</select>
<insert id="insertHistoryHourlyComplete">
@@ -50,4 +56,14 @@
(#{item.mac}, #{item.time}, #{item.value})
</foreach>
</insert>
+
+
+ <insert id="insertHistoryHourlyAvg">
+ INSERT INTO
+ history_hourly_${timeUnits}
+ VALUES
+ <foreach collection="list" item="item" separator=",">
+ (#{item.mac}, #{item.time}, #{item.value}, #{item.version})
+ </foreach>
+ </insert>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0