From 47e42466d50e4293a05c8c9a9c9da09e8e554fb6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 10 Aug 2020 11:33:44 +0800
Subject: [PATCH] update

---
 src/main/java/com/moral/service/HistoryService.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 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..2ab5e0e 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -1,14 +1,40 @@
 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);
+
+	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);
+
 
 }

--
Gitblit v1.8.0