From 0fd34e51dadbf9598188b0e061b658139e6d6257 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Fri, 22 Jun 2018 13:47:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/moral/service/HistoryService.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java index e08b6a6..dec4d08 100644 --- a/src/main/java/com/moral/service/HistoryService.java +++ b/src/main/java/com/moral/service/HistoryService.java @@ -1,6 +1,7 @@ package com.moral.service; import java.util.Date; +import java.util.List; import java.util.Map; @@ -11,4 +12,6 @@ Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters); String queryValueByMacAndTime(String mac, Date time); + + List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters); } -- Gitblit v1.8.0