From adde1ed1a99622c80a95dea83e294711d295c55c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 08 Sep 2020 14:46:43 +0800
Subject: [PATCH] 微型站5分钟与半小时数据

---
 src/main/java/com/moral/mapper/HistoryMapper.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 99ecf83..3b6d2ea 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);
@@ -28,4 +28,18 @@
     
     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);
+	String getJsonData(@Param("mac") String mac,
+					   @Param("time") String time,
+					   @Param("table") String table);
 }
\ No newline at end of file

--
Gitblit v1.8.0