From e2a392fc297955d399e1cb767f335a0f5fb33c79 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 11 Sep 2020 10:26:17 +0800
Subject: [PATCH] POM版本修改
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 46f16e7..e57f1c8 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -67,7 +67,7 @@
<select id="getBeamByMacs" resultType="java.util.Map">
SELECT
- DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s') time,
+ DATE_FORMAT(h.time,#{typeFormat}) time,
avg(h.json->'$.e12[0]') beam
FROM history_hourly h
WHERE h.mac in
@@ -98,4 +98,7 @@
and h.json->'$.e17[0]' is not null
group by h.time
</select>
+ <select id="getDataByMacAndTime" resultType="java.util.Map">
+ SELECT DATE_FORMAT(`time`,'%Y-%m-%d %H:%i:%s') as `time`,json->'$.${sensor}[0]' as ${sensor} FROM `history_hourly` where `mac`=#{mac} and `time`>=#{startTime} and `time`<#{endTime}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0