From 9f965bfa801be97c4683ae53bcb4ce897228fd14 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 07 Jul 2023 15:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into cjl
---
screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
index 2c7cca4..40ac177 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 '������',
@@ -13,8 +13,8 @@
</update>
<update id="createTableComplete" parameterType="String">
- CREATE TABLE IF NOT EXISTS `history_hourly_complete_${timeUnits}` (
- `mac` VARCHAR (20) DEFAULT NULL COMMENT '������mac',
+ 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`)
@@ -41,4 +41,13 @@
WHERE `time` <![CDATA[>=]]> #{start}
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