From 1d7e1b771160dd8b7f25765e402ce25cac676641 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 24 Nov 2020 15:58:33 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/mapper/HistoryHourlyMapper.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryHourlyMapper.java b/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
index a7f3c4c..651d743 100644
--- a/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
@@ -3,6 +3,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.security.access.method.P;
+import java.lang.reflect.Array;
import java.util.List;
import java.util.Map;
@@ -30,4 +31,25 @@
@Param("sensor") String sensor,
@Param("startTime") String startTime,
@Param("endTime") String endTime);
+ List<Map> getDataByMacAndTime1(@Param("mac") String mac,
+ @Param("sensor") String sensor,
+ @Param("startTime") String startTime,
+ @Param("endTime") String endTime);
+
+ List<Map<String,Object>> getDataAvbByMIdAndTime( @Param("mId")String mId,
+ @Param("startTime")String startTime,
+ @Param("endTime")String endTime);
+
+ List<Map<String,Object>> getDataByMonitorPoints(@Param("mIds") String[] mIds,
+ @Param("startTime")String startTime,
+ @Param("endTime")String endTime);
+
+
+ Map<String,Object> getAvgDataByMId(@Param("mId")String mId,
+ @Param("startTime")String startTime,
+ @Param("endTime")String endTime);
+
+ Map<String,Object> getAvgDataByMIds(@Param("mIds")String[] mIds,
+ @Param("startTime")String startTime,
+ @Param("endTime")String endTime);
}
--
Gitblit v1.8.0