From eb9668cfd9e05e06d6571eac389d7a4968354c14 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Tue, 10 Nov 2020 14:56:35 +0800
Subject: [PATCH] 标准公式显示

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

diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 404b31f..5ab081a 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -8,6 +8,7 @@
 
 public interface HistoryMapper{
 	String selectValueByMacAndTime(@Param("mac")String mac, @Param("time")Date time);
+	String getValueByMacAndTime(@Param("mac")String mac, @Param("time")String time,@Param("time1")String time1);
 	List<Map<String, Object>> getAreaAllDataByAccount(Map<String, Object> parameters);
 
 	List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
@@ -30,6 +31,8 @@
 
     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);
 
 	//���������������������������
@@ -37,4 +40,7 @@
 
 	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