From dcf1385a88fdf517e2cc60b50ea2e0a30e5652ca Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Dec 2020 15:06:26 +0800
Subject: [PATCH] 更改获取五分钟数据结构BUG

---
 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 9f2247b..dddd7e1 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -3,11 +3,13 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.alibaba.fastjson.JSONObject;
 import com.moral.common.bean.PageBean;
 import com.moral.entity.Device;
 import com.moral.entity.MonitorPoint;
+import org.apache.xmlbeans.impl.jam.mutable.MPackage;
 
 public interface MonitorPointService {
 
@@ -30,7 +32,11 @@
 
     List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);
 
+    List<MonitorPoint> getMonitorPointsByOrganizationIds(Set<Integer> orgIds);
+
 	List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);
+
+    List<MonitorPoint> getMonitorPointsAndDevicesByRegionNew(Map<String, Object> parameters);
 
     List<Integer> queryVersionsById(Integer id);
 
@@ -53,4 +59,8 @@
     JSONObject getMacList(int id);
 
     List<MonitorPoint> getMonitorPointListByAccountId(int id);
+
+    MonitorPoint byIdGetMonitorPoint(int id);
+
+    String getOrgIdByMac(String mac);
 }

--
Gitblit v1.8.0