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/HistoryHourlyMapper.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryHourlyMapper.java b/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
index ce7ea9f..b81c969 100644
--- a/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
@@ -1,6 +1,7 @@
package com.moral.mapper;
import org.apache.ibatis.annotations.Param;
+import org.springframework.security.access.method.P;
import java.util.List;
import java.util.Map;
@@ -22,4 +23,19 @@
List<Map<String,Object>> getBeamByMacs(Map<String,Object> params);
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);
}
--
Gitblit v1.8.0