From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

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

diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index aa9cef8..268b7c3 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -1,5 +1,6 @@
 package com.moral.service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -23,5 +24,21 @@
 	List<MonitorPoint> getMonitorPointsByName(String name);
     List<Map<String,String>> queryMonitroPointsState(List<Integer> idList);
 
-	List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);
+    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);
+
+	List<MonitorPoint> getMonitorPointsAndDevicesByRegion(Map<String, Object> parameters);
+
+	Collection<Object> getDevicesStateByRegion(Map<String, Object> parameters);
+
+	void isCompensateCalculation(Map<String, Object> parameters);
+	
+	Map<String, Object> selectAllById(String id);
 }

--
Gitblit v1.8.0