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/java/com/moral/mapper/MonitorPointMapper.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/mapper/MonitorPointMapper.java b/src/main/java/com/moral/mapper/MonitorPointMapper.java
index ad96bd6..112fd4d 100644
--- a/src/main/java/com/moral/mapper/MonitorPointMapper.java
+++ b/src/main/java/com/moral/mapper/MonitorPointMapper.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.moral.entity.Device;
 
@@ -46,4 +47,10 @@
     List<Integer> getMonitorPointIds(Map<String, Object> params);
 
     List<MonitorPoint> byCodeGetMonitor(Map<String, Object> params);
+
+    String getOrgIdByMac(String mac);
+
+    String getMonitorName(int mpId);
+
+    List<MonitorPoint> getMonitorPointsByOrganizationIds(@Param("orgIds") Set<Integer> orgIds);
 }
\ No newline at end of file

--
Gitblit v1.8.0