From 0359860dbc5de19f3d099ff549af0b4c48a08221 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 10 Dec 2021 14:31:27 +0800
Subject: [PATCH] 经纬度实体类,计算中心点工具类,修改热力图接口经纬度顺序

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

diff --git a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
index bd1b0e3..8f133ca 100644
--- a/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -7,12 +7,13 @@
             `mac` VARCHAR (20) 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>
 
     <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,7 +27,7 @@
     </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}

--
Gitblit v1.8.0