From dad9ebf1e6bfd86e7d4ce9cb976a8f24422c4cf7 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 28 Dec 2021 15:30:55 +0800
Subject: [PATCH] 获取设备一天24小时平均值、最小值、最大值接口

---
 screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
index 88153ae..cb18cd2 100644
--- a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -12,6 +12,15 @@
             ) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT '���������������'
     </update>
 
+    <update id="createTableComplete" parameterType="String">
+        CREATE TABLE IF NOT EXISTS `history_hourly_${timeUnits}_complete` (
+            `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_${timeUnits} VALUES
         <foreach collection="list" item="item" separator=",">
@@ -30,6 +39,15 @@
         SELECT mac, `time`, `value`
         FROM history_hourly_${timeUnits}
         WHERE `time` <![CDATA[>=]]> #{start}
-        AND `time` <![CDATA[<=]]> #{end}
+        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