From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index fdb9ac2..30bfe68 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -225,4 +225,19 @@
         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>
+
+    <select id="getMonitorPointsByOrganizationIds" resultMap="BaseResultMap">
+        SELECT
+        *
+        FROM monitor_point m
+        WHERE m.`organization_id`
+        IN
+        <foreach collection="orgIds" item="orgId" close=")" open="(" separator=",">
+            #{orgId}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0