From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/mapper/HistoryHourlyMapper.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryHourlyMapper.java b/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
index ee570d4..651d743 100644
--- a/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
@@ -1,7 +1,9 @@
package com.moral.mapper;
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;
@@ -24,4 +26,30 @@
List<Map<String, Object>> getDataByTimeSlot(@Param("mac") String mac, @Param("startTime") String startTime, @Param("endTime") String endTime);
List<Map<String,Object>> getTVOCByMacs(Map<String,Object> params);
+
+ List<Map> getDataByMacAndTime(@Param("mac") String mac,
+ @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