From fbec1c270bfbeac936035cbc9db61d8a1162ccf9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 05 Mar 2018 10:35:27 +0800
Subject: [PATCH] 报表优化

---
 src/main/resources/mapper/HistoryMinutelyMapper.xml |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 99b0cb4..3f3e22f 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -2,14 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.moral.mapper.HistoryMinutelyMapper">
 
-	<select id="getDayAQIByDevice" resultType="map">
+	<select id="getSersionAvgByDevice" resultType="java.util.LinkedHashMap">
 		SELECT
-			AVG(json -> '$.e1[0]') e1,
-			AVG(json -> '$.e2[0]') e2,
-			AVG(json -> '$.e10[0]') e10,
-			AVG(json -> '$.e11[0]') e11,
-			AVG(json -> '$.e15[0]') e15,
-			AVG(json -> '$.e16[0]') e16
+			${sensorKeyColumn}
 		FROM
 			history_minutely
 		WHERE
@@ -18,7 +13,7 @@
 		AND time &lt; #{end}
 	</select>
 	
-	<select id="getMonitorPointOrDeviceAvgData" resultType="map">
+	<select id="getMonitorPointOrDeviceAvgData" resultType="java.util.LinkedHashMap">
 		SELECT
 			DATE_FORMAT(time, #{typeFormat}) time,
 			${sensorKeyColumn}

--
Gitblit v1.8.0