From a79045aa1246299b6aa2a278744496effcf630e7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 10 Nov 2023 14:17:53 +0800
Subject: [PATCH] fix：token问题修改
---
screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
index bd1b0e3..6818460 100644
--- a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -4,15 +4,25 @@
<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">
- INSERT INTO history_hourly VALUES
+ INSERT INTO history_hourly_${timeUnits} VALUES
<foreach collection="list" item="item" separator=",">
(#{item.mac}, #{item.time}, #{item.value}, #{item.version})
</foreach>
@@ -26,9 +36,34 @@
</select>
<select id="selectDailyData" resultType="java.util.Map">
- SELECT mac, `value`
+ SELECT mac, `time`, `value`
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">
+ INSERT INTO
+ history_hourly_${timeUnits}_complete
+ VALUES
+ <foreach collection="list" item="item" separator=",">
+ (#{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