From e25c689888a0dd80d07ffc4e4a45bd290b3d010c Mon Sep 17 00:00:00 2001
From: yuzixiang <yzx123456>
Date: Tue, 19 May 2020 16:50:21 +0800
Subject: [PATCH] 计算臭氧平缓平均值

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

diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 2247950..2779451 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -1,16 +1,40 @@
 package com.moral.mapper;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ibatis.annotations.Param;
+
 public interface HistoryMapper{
-
-	Map<String, Double> getDayAQIByDevice(Map<String, Object> parameters);
-
-	Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters);
-
-	List<Map<String, Object>> getSensorsAverageByDevice4Report(Map<String, Object> parameters);
-
+	String selectValueByMacAndTime(@Param("mac")String mac, @Param("time")Date time);
 	List<Map<String, Object>> getAreaAllDataByAccount(Map<String, Object> parameters);
 
+	List<Map<String, Object>> getRegionRankingData(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>> listGetSensorData(Map<String, Object> parameters);
+
+	//���������������������������
+	String 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