From 8efcc21de04bd7f7d784dac97e86e76e1a3ab930 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:47:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/MonitorPointService.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 014cbc2..b6fe1ac 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -19,4 +19,11 @@
     public void addOrModify(MonitorPoint monitorPoint);
 
 	public void deleteByIds(Integer... ids);
+	
+	List<MonitorPoint> getMonitorPointsByName(String name);
+    List<Map<String,String>> queryMonitroPointsState(List<Integer> idList);
+
+	List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);
+
+	List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);
 }

--
Gitblit v1.8.0