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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
index 9f9c679..56024a1 100644
--- a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -2,18 +2,58 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.api.mapper.HistoryHourlyMapper">
- <!-- ������������������������ -->
- <resultMap id="BaseResultMap" type="com.moral.api.entity.HistoryHourly">
- <result column="mac" property="mac"/>
- <result column="time" property="time"/>
- <result column="value" property="value"/>
- <result column="version" property="version"/>
- </resultMap>
+ <update id="createTable" parameterType="String">
+ CREATE TABLE IF NOT EXISTS `history_hourly_${timeUnits}` (
+ `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>
</insert>
+
+ <select id="selectCountByTime" resultType="java.lang.Integer">
+ SELECT COUNT(1) FROM history_hourly_${timeUnits} WHERE `time` = #{time}
+ <if test="mac != null">
+ AND mac = #{mac}
+ </if>
+ </select>
+
+ <select id="selectDailyData" resultType="java.util.Map">
+ 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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0