From ff93f1357ed5d23895062b7ac14d9b194324c8b5 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 09 Jun 2018 11:34:46 +0800
Subject: [PATCH] test

---
 src/main/resources/mapper/HistoryMinutelyMapper.xml |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 4b1ea6e..70c57d3 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -13,7 +13,22 @@
 		FROM
 			history_minutely
 		WHERE
-			mac = #{mac}
+			mac IN
+				(SELECT
+					d.mac 
+				FROM
+					device d,
+					monitor_point mp 
+				WHERE
+					d.is_delete = 0 
+					AND d.monitor_point_id = mp.id 
+					<if test="monitorPointId != null">
+					AND mp.id =	#{monitorPointId}
+					</if>
+					<if test="mac != null">
+					AND d.mac = #{mac}
+					</if>
+				)	
 		AND time >= #{start}
 		AND time &lt; #{end}
 	</select>
@@ -52,6 +67,9 @@
 				</if>
 				<if test="monitorPointId != null">
 				AND mp.id =	#{monitorPointId}
+				</if>
+				<if test="professionId != null">
+				AND d.profession_id = #{professionId}
 				</if>
 			)	
 		</if>
@@ -93,6 +111,9 @@
 					 <if test='"DEVICE"==dataCondition.areaRange.toString()'>
 						and dev.id = #{dataCondition.areaRangeId}
 					 </if>
+					<if test='"PROFESSION"==dataCondition.deviceDimension.toString()'>
+						and dev.profession_id = #{dataCondition.dimensionValue}
+					</if>
 					<if test='"MONITORPOINT"==dataCondition.areaRange.toString()'>
 						and mpt.id = #{dataCondition.areaRangeId}
 					</if>

--
Gitblit v1.8.0