From 539a7077cbf638a5aa9ae5e46c17be96daba7d9b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 02 Jul 2018 10:54:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/HistoryMapper.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 124ce9a..66ff879 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -1,10 +1,19 @@
package com.moral.mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
import java.util.List;
import java.util.Map;
public interface HistoryMapper{
-
+ String selectValueByMacAndTime(@Param("mac")String mac, @Param("time")Date time);
List<Map<String, Object>> getAreaAllDataByAccount(Map<String, Object> parameters);
+ List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
+
+ List<Map<String, Object>> selectNextLevelRegion(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getDischargeByRegion(Map<String, Object> parameters);
+
}
\ No newline at end of file
--
Gitblit v1.8.0