From 7b03a1d14a165cc6932067e17f1fb30f68fd34a5 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Mon, 10 Jul 2023 15:42:53 +0800 Subject: [PATCH] chore: 提交测试 --- screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml index 88153ae..40ac177 100644 --- a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml +++ b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml @@ -4,12 +4,21 @@ <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 '������', KEY `idx_mac_time` (`mac`,`time`) ) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT '���������������' + </update> + + <update id="createTableComplete" parameterType="String"> + CREATE TABLE IF NOT EXISTS `history_hourly_${timeUnits}_complete` ( + `mac` VARCHAR (30) DEFAULT NULL COMMENT '������mac', + `time` datetime DEFAULT NULL COMMENT '������������', + `value` json DEFAULT NULL COMMENT '������', + KEY `idx_mac_time` (`mac`,`time`) + ) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT '���������������������������������������������������������' </update> <insert id="insertHistoryHourly"> @@ -30,6 +39,15 @@ SELECT mac, `time`, `value` FROM history_hourly_${timeUnits} WHERE `time` <![CDATA[>=]]> #{start} - AND `time` <![CDATA[<=]]> #{end} + AND `time` <![CDATA[<]]> #{end} </select> + + <insert id="insertHistoryHourlyComplete"> + INSERT INTO + history_hourly_${timeUnits}_complete + VALUES + <foreach collection="list" item="item" separator=","> + (#{item.mac}, #{item.time}, #{item.value}) + </foreach> + </insert> </mapper> \ No newline at end of file -- Gitblit v1.8.0