From 1babbf1c0b2bc8d27f2874c85369e394b545594a Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 11 May 2020 11:24:00 +0800
Subject: [PATCH] add轨迹信息显示按秒级显示,update轨迹数据先从history表查询,update报表单位问题

---
 src/main/java/com/moral/mapper/HistoryMapper.java |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 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..f15fe72 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -1,16 +1,34 @@
 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);
 }
\ No newline at end of file

--
Gitblit v1.8.0