From 86916a5b7c8ed98221c03e440a9aad0f38109263 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 05 Sep 2018 09:52:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 5d8905f..ad0afe4 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -21,5 +21,15 @@
 	public void deleteByIds(Integer... ids);
 	
 	List<MonitorPoint> getMonitorPointsByName(String name);
+    List<Map<String,String>> queryMonitroPointsState(List<Integer> idList);
 
+    Integer countOfSubOrgs(Integer orgId);
+
+    List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);
+
+	List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);
+
+    List<Integer> queryVersionsById(Integer id);
+
+    MonitorPoint queryMonitorPointById(Integer mpointId);
 }

--
Gitblit v1.8.0