From 28215e381131b0919567ec5c3f236b29ebd3ad5c Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 22 Oct 2019 16:02:18 +0800
Subject: [PATCH] update
---
src/main/resources/mapper/SensorMapper.xml | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
index 4dfc9d8..ccfa2cf 100644
--- a/src/main/resources/mapper/SensorMapper.xml
+++ b/src/main/resources/mapper/SensorMapper.xml
@@ -138,10 +138,25 @@
</select>
<select id="getSensorByMonitorPointId" resultType="java.util.Map">
- SELECT DISTINCT s.*
+ 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
WHERE d.device_version_id = dvs.device_version_id
AND dvs.sensor_id = s.id
AND d.monitor_point_id = #{monitor_point_id}
</select>
+
+ <select id="getSensorsByMac" resultMap="BaseResultMap">
+ SELECT
+ DISTINCT s.*
+ FROM
+ sensor s,
+ device_version_sensor dvs,
+ device d
+ WHERE
+ s.id = dvs.sensor_id
+ AND dvs.device_version_id = d.device_version_id
+ <if test="mac != null">
+ AND d.mac = #{mac}
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0