From f718fb9c06fa75b65870a3f5ef2fea10054009aa Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 12 Aug 2020 09:31:26 +0800
Subject: [PATCH] 风场图

---
 src/main/java/com/moral/mapper/HistoryMapper.java |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 3afddc2..fdfc45b 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -1,10 +1,10 @@
 package com.moral.mapper;
 
-import org.apache.ibatis.annotations.Param;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
 
 public interface HistoryMapper{
 	String selectValueByMacAndTime(@Param("mac")String mac, @Param("time")Date time);
@@ -12,6 +12,31 @@
 
 	List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
 
-	List<Map<String, Object>> selectNextLevelRegion(Map<String, Object> parameters);
+	List<String> selectNextLevelRegion(Map<String, Object> parameters);
 
+	List<Map<String, Object>> getDischargeByRegion(Map<String, Object> parameters);
+	
+	List<Map<String, Object>> getValueByMacAndSize(Map<String, Object> parameters);
+
+	Map<String, Object> getActualDataByRegion(Map<String, Object> parameters);
+	
+	Map<String, Object> getAVGValueByMacAndTimeslot(@Param("mac")String mac, @Param("starttime")String starttime, @Param("endtime")String endtime);
+
+    List<Map<String, Object>> getSensorDataToday(Map<String, Object> parameters);
+    
+    List<Map<String, Object>> getAVGSensorRankByMonitorPointIdList(@Param("sensor")String sensor, @Param("monitorPointIdList") List<Object> monitorPointIdList, @Param("before5Time")String before5Time, @Param("endTime")String endTime);
+    
+    Map<String, Object> getMonitorPointAVGValueByMonitorPointIdAndTimeslot(@Param("monitor_point_id")String monitor_point_id, @Param("starttime")String starttime, @Param("endtime")String endtime);
+
+    List<Map<String, Object>> getCarSensorData(Map<String, Object> parameters);
+
+	List<Map<String, Object>> getUavSensorData(Map<String, Object> parameters);
+
+    List<Map<String, Object>> listGetSensorData(Map<String, Object> parameters);
+
+	//���������������������������
+	List<Map<String, Object>> getO3AVG(Map<String, Object> parameters);
+
+	int getNum(@Param("timef") String timef,
+			   @Param("timea") String timea);
 }
\ No newline at end of file

--
Gitblit v1.8.0