From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/resources/mapper/HistoryMinutelyMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 1509a27..3a2d3c1 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -31,14 +31,14 @@
AND time < #{end}
</select>
- <select id="getMonitorPointOrDeviceAvgData" resultType="java.util.LinkedHashMap">
+ <select id="getMonitorPointOrDeviceAvgData" resultType="java.util.Map">
SELECT
DATE_FORMAT(time, #{typeFormat}) time
<foreach collection="sensorKeys" open="," separator="," item="sensorKey">
AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
</foreach>
FROM
- history_minutely h
+ history_${timeUnits} h
WHERE
h.time >= #{start}
AND h.time <![CDATA[<]]> #{end}
--
Gitblit v1.8.0