From dbed3099ea0dd2a517b739f29943d4ee529760e6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 17 Jun 2019 15:23:45 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_v2.git

---
 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 ad0afe4..04f02e9 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;
 
@@ -32,4 +33,10 @@
     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);
 }

--
Gitblit v1.8.0