From a66d53c3cbfb0024804045f4d795be06089d4f9d Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 03 Dec 2020 17:54:15 +0800
Subject: [PATCH] 五分钟表相关代码,平均风向、平局风速工具类

---
 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 3ff350d..dddd7e1 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -3,6 +3,7 @@
 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;
@@ -31,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);
 
@@ -56,4 +61,6 @@
     List<MonitorPoint> getMonitorPointListByAccountId(int id);
 
     MonitorPoint byIdGetMonitorPoint(int id);
+
+    String getOrgIdByMac(String mac);
 }

--
Gitblit v1.8.0