From 296d509996b9500c35be0b81860fa14c1d275048 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 10:47:51 +0800
Subject: [PATCH] 更改五分钟数据接口,添加界面左侧站点设备信息接口

---
 src/main/java/com/moral/service/HistoryService.java |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index 8c88967..3ed919d 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -1,14 +1,44 @@
 package com.moral.service;
 
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 
 public interface HistoryService {
 
-	Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters);
+	Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters) throws Exception;
 
 	Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters);
 
-	Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
+    String queryValueByMacAndTime(String mac, Date time);
+
+    String getValueByMacAndTime(String mac, String time,String time1);
+
+	List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
+	
+	List<Map<String, Object>> getSensorsDataByDevice(Map<String, Object> parameters);
+
+	List<Map<String, Object>> getSensorDataBySensorKey(Map<String, Object> parameters);
+
+	Map<String, Object> getActualDataByRegion(Map<String, Object> parameters);
+
+	Map<String, Object> getSensorUnitByDeviceMac(Map<String, Object> parameters);
+	
+	Map<String, Object> gitHourlyAQIByMacAndTimeslot(Map<String, Object> parameters);
+	
+	List<Map<String, Object>> getMointorPointRankByOrganizationId(Map<String, Object> parameters);
+	
+	Map<String, Object> gitHourlyAQIByMonitorPointIdAndTimeslot(Map<String, Object> parameters);
+
+    List<List<Map<String, Object>>> getCarSensorData(Map<String, Object> parameters) throws Exception;
+
+	List<Map<String, Object>> getUavSensorData(Map<String, Object> parameters);
+
+    //������������������������������
+	List<Map<String, Object>> getO3AVG(Map<String, Object> parameters);
+
+	String getJsonData(String mac,String time,String table);
+
 
 }

--
Gitblit v1.8.0