From ef3a45a366ea8451f2581547fa6a3894bd1d672f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 29 Aug 2019 10:33:35 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 90f86d8..04eb222 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -24,9 +24,6 @@
void convertQueryParam(Map<String, Object> parameters) throws ParseException;
- List<Map<String, Object>> getSensorData(Map<String, Object> parameters) throws Exception;
+ List<List<Map<String, Object>>> getSensorData(Map<String, Object> parameters) throws Exception;
- List<Map<String, Object>> getSensorDataMin(Map<String, Object> parameters) throws Exception;
-
- List<Map<String, Object>> getSensorDataMax(Map<String, Object> parameters) throws Exception;
}
--
Gitblit v1.8.0