From b888331b6ba56caeeab12a4543fe81bac8854794 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 31 Aug 2021 17:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
index f80edaf..bd1b0e3 100644
--- a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -2,13 +2,14 @@
<!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 (20) 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
@@ -17,16 +18,17 @@
</foreach>
</insert>
- <select id="getHistoryHourlyTransition" resultType="com.moral.api.entity.HistoryHourly">
- SELECT mac,
- `time`,
- `value`,
- `version`
- FROM history_hourly_transition
- WHERE create_time = update_time
+ <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>
- <delete id="deleteHistoryHourlyTransition">
- DELETE FROM history_hourly_transition
- </delete>
+ <select id="selectDailyData" resultType="java.util.Map">
+ SELECT mac, `value`
+ FROM history_hourly_${timeUnits}
+ WHERE `time` <![CDATA[>=]]> #{start}
+ AND `time` <![CDATA[<]]> #{end}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0