From 6688e50ba02988d742baadaca156a303a90b6191 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 20 Apr 2018 14:03:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 4e9e4c3..4b1ea6e 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -20,8 +20,8 @@
<select id="getMonitorPointOrDeviceAvgData" resultType="java.util.Map">
SELECT
- DATE_FORMAT(time, #{typeFormat}) time,
- <foreach collection="sensorKeys" separator="," item="sensorKey">
+ DATE_FORMAT(time, #{typeFormat}) time
+ <foreach collection="sensorKeys" open="," separator="," item="sensorKey">
AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
</foreach>
FROM
--
Gitblit v1.8.0