From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/service/MonitorPointService.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 4328dc4..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,11 +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