From 4e58ec2f90f326c9d552cc5c1ecbfecfa3be1647 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 25 Jul 2019 14:27:35 +0800
Subject: [PATCH] 新增无人机在时间段查询sensor值集合的Service接口

---
 src/main/resources/mapper/HistoryMinutelyMapper.xml |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index ff3b4fc..3a2d3c1 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -13,7 +13,20 @@
 		FROM
 			history_minutely
 		WHERE
-			mac = #{mac}
+			mac IN
+				(SELECT
+					d.mac 
+				FROM
+					device d
+				WHERE
+					d.is_delete = 0 
+					<if test="monitorPointId != null">
+					AND d.monitor_point_id = #{monitorPointId}
+					</if>
+					<if test="mac != null">
+					AND d.mac = #{mac}
+					</if>
+				)	
 		AND time >= #{start}
 		AND time &lt; #{end}
 	</select>
@@ -25,7 +38,7 @@
 				AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
 			</foreach>
 		FROM
-			history_minutely h
+			history_${timeUnits} h
 		WHERE
 			h.time >= #{start}
 		AND h.time <![CDATA[<]]> #{end}
@@ -53,6 +66,9 @@
 				<if test="monitorPointId != null">
 				AND mp.id =	#{monitorPointId}
 				</if>
+				<if test="professionId != null">
+				AND d.profession_id = #{professionId}
+				</if>
 			)	
 		</if>
 		

--
Gitblit v1.8.0