From 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Dec 2020 14:39:08 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/resources/mapper/SensorMapper.xml |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
index be66b3f..74a078e 100644
--- a/src/main/resources/mapper/SensorMapper.xml
+++ b/src/main/resources/mapper/SensorMapper.xml
@@ -137,6 +137,15 @@
 		AND d.id = #{id}
 	</select>
 
+    <select id="getSensorByDId" resultType="java.util.Map">
+		SELECT DISTINCT d.monitor_point_id,s.*
+		FROM device d,device_version dv,device_version_sensor dvs,sensor s
+		WHERE d.device_version_id = dvs.device_version_id
+		AND dvs.sensor_id = s.id
+		AND d.id = #{id}
+	</select>
+
+
     <select id="getSensorByMonitorPointId" resultType="java.util.Map">
 		SELECT DISTINCT s.sensor_key sensorKey,s.unit,s.name,s.description,s.id
 		FROM device d,device_version dv,device_version_sensor dvs,sensor s

--
Gitblit v1.8.0