From a7b1117ea24c4ffd783c52a0685961eff95f049f Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 17 Dec 2020 15:49:48 +0800
Subject: [PATCH] UV风向工具类修改,根据时间段获取五分钟数据

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

diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 04f02e9..dddd7e1 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -3,9 +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 {
 
@@ -28,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);
 
@@ -39,4 +47,20 @@
 	Collection<Object> getDevicesStateByRegion(Map<String, Object> parameters);
 
 	void isCompensateCalculation(Map<String, Object> parameters);
+	
+	Map<String, Object> selectAllById(String id);
+
+    //������monitorPointId������������������������������������
+    List<Device> getDeviceList(int id);
+
+    //���������������������������id
+    JSONObject getMonitorPointById(int id, String Time, int i, String sensor);
+
+    JSONObject getMacList(int id);
+
+    List<MonitorPoint> getMonitorPointListByAccountId(int id);
+
+    MonitorPoint byIdGetMonitorPoint(int id);
+
+    String getOrgIdByMac(String mac);
 }

--
Gitblit v1.8.0