From cd264145f9b4107f1430da46269dd306d26f3116 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 13:16:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/HistoryMapper.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 2779451..74c339e 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,11 +31,18 @@
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);
//���������������������������
- String getO3AVG(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);
+
+ Map<String,Object> getDailyAvgData(@Param("mId")String mId,@Param("time")String time);
}
\ No newline at end of file
--
Gitblit v1.8.0