From c3e1f9b9af29647bd157f2ea268bc56b2d3b9df1 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 31 Aug 2020 14:47:46 +0800
Subject: [PATCH] 风场图update

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

diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index f5c7068..ebcae1f 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -1,5 +1,7 @@
 package com.moral.service;
 
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 
@@ -9,4 +11,32 @@
 
 	Map<String, Object> getDeviceRankingBySensorAverage(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);
+
+	String getJsonData(String mac,String time,String table);
+
+
 }

--
Gitblit v1.8.0