From b4cabe178f1a36433270c79048beecfab0edc487 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 30 Jan 2018 17:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/DeviceMapper.xml | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index fbe298a..dd91d71 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -98,20 +98,26 @@
</if>
GROUP BY d.state
</select>
-
- <select id="getSensorsByDevice" resultType="map">
+
+ <select id="getDeviceVersionIdByMonitorPoint" resultType="map">
SELECT
- s.`key`,
- s.`name`
+ device_version_id deviceVersionId
FROM
- sensor s,
- device d,
- device_version_sensor dvs
+ device
WHERE
- d.mac = #{mac}
- AND d.device_version_id = dvs.version_id
- AND dvs.sensor_id = s.id
- ORDER BY
- s.id
+ monitor_point_id = #{monitorPoint}
+ GROUP BY
+ device_version_id
</select>
+
+ <select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="string">
+ SELECT
+ mac
+ FROM
+ device
+ WHERE
+ monitor_point_id = #{monitorPointId}
+ AND device_version_id = #{deviceVersionId}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0