From 0ce061d9ed37a6c25fff70e4734fa8cc8747237c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 26 Jul 2023 19:45:09 +0800
Subject: [PATCH] fix: 部分提交
---
screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml | 28 ++++++++++++++++++++++++++--
1 files changed, 26 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..56024a1 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,21 @@
SELECT mac, `time`, `value`
FROM history_hourly_${timeUnits}
WHERE `time` <![CDATA[>=]]> #{start}
- AND `time` <![CDATA[<=]]> #{end}
+ 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">
+ 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