From 2c42977a1a38e4f079c5c44fe51a46c27b865f80 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 23 Oct 2020 10:29:27 +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