From 2973f298e49fd8dff95065ef88d2997fe4eed338 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Oct 2020 11:18:19 +0800
Subject: [PATCH] 建立五分钟数据表以及读取一分钟表数据计算平均值到五分钟表的接口

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

diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index cf4fc42..ef5edec 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -68,7 +68,8 @@
         DATE_FORMAT(h.time,#{typeFormat}) time,
         avg(h.json->'$.e12[0]') 'beam'
         FROM history_hourly h
-        WHERE h.mac in
+        WHERE h.json->'$.e12[0]' is not null
+        and h.mac in
         <foreach collection="macs" open="(" separator="," close=")" item="mac">
             #{mac}
         </foreach>
@@ -76,7 +77,6 @@
         <foreach collection="times" open="(" separator="," close=")" item="time">
             #{time}
         </foreach>
-        and h.json->'$.e12[0]' is not null
         group by h.time
     </select>
 

--
Gitblit v1.8.0