From d32fa50fca18a3fff89b9ec22deaa3d964ddd19b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 12:34:27 +0800
Subject: [PATCH] 大屏布局监控点 返回配置数据

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

diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 70c57d3..1509a27 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -17,13 +17,11 @@
 				(SELECT
 					d.mac 
 				FROM
-					device d,
-					monitor_point mp 
+					device d
 				WHERE
 					d.is_delete = 0 
-					AND d.monitor_point_id = mp.id 
 					<if test="monitorPointId != null">
-					AND mp.id =	#{monitorPointId}
+					AND d.monitor_point_id = #{monitorPointId}
 					</if>
 					<if test="mac != null">
 					AND d.mac = #{mac}
@@ -33,7 +31,7 @@
 		AND time &lt; #{end}
 	</select>
 	
-	<select id="getMonitorPointOrDeviceAvgData" resultType="java.util.Map">
+	<select id="getMonitorPointOrDeviceAvgData" resultType="java.util.LinkedHashMap">
 		SELECT
 			DATE_FORMAT(time, #{typeFormat}) time
 			<foreach  collection="sensorKeys" open="," separator="," item="sensorKey">

--
Gitblit v1.8.0