From 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Dec 2020 14:39:08 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index dea3a4f..35be96b 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -38,8 +38,6 @@
List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters) throws Exception;
- List<Map<String, Object>> getFiveMinutesDataByMacsAndTime(Map<String, Object> parameters);
-
- List<Map<String, Object>> getDevicesSensorsToExcel(Map<String, Object> parameters);
+ List<Map<String, Object>> getAllDeviceDataToExcel(Map<String, Object> parameters) throws Exception;
}
--
Gitblit v1.8.0