From cd264145f9b4107f1430da46269dd306d26f3116 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 13:16:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index eacf56d..c4da432 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -219,4 +219,14 @@
             province_code = #{provinceCode}
         </if>
     </select>
+
+    <select id="getOrgIdByMac" resultType="String">
+        SELECT m.`organization_id` orgId FROM monitor_point m
+        JOIN device d ON d.`monitor_point_id` = m.`id`
+        AND d.`mac`= #{mac}
+    </select>
+
+    <select id="getMonitorName" resultType="java.lang.String">
+        select name from monitor_point where id=#{mpId}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0