From cf42a18aba4da77141dd0ea65918444636f899e1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Dec 2020 10:50:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/SensorMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
index 628c1b8..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
@@ -198,4 +207,11 @@
)
and dvs.sensor_id=s.id
</select>
+
+ <select id="getSensorKeys" resultType="java.lang.String">
+ select
+ sensor_key
+ from
+ sensor
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0