From 83e42707519f5e2d886618ea55c30e8c3ab381ac Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 09 Aug 2023 09:13:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
index cb18cd2..56024a1 100644
--- a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -4,7 +4,7 @@
<update id="createTable" parameterType="String">
CREATE TABLE IF NOT EXISTS `history_hourly_${timeUnits}` (
- `mac` VARCHAR (20) DEFAULT NULL COMMENT '������mac',
+ `mac` VARCHAR (30) DEFAULT NULL COMMENT '������mac',
`time` datetime DEFAULT NULL COMMENT '������������',
`value` json DEFAULT NULL COMMENT '������',
`version` INT(11) DEFAULT NULL COMMENT '������',
@@ -14,7 +14,7 @@
<update id="createTableComplete" parameterType="String">
CREATE TABLE IF NOT EXISTS `history_hourly_${timeUnits}_complete` (
- `mac` VARCHAR (20) DEFAULT NULL COMMENT '������mac',
+ `mac` VARCHAR (30) DEFAULT NULL COMMENT '������mac',
`time` datetime DEFAULT NULL COMMENT '������������',
`value` json DEFAULT NULL COMMENT '������',
KEY `idx_mac_time` (`mac`,`time`)
@@ -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">
--
Gitblit v1.8.0