From e6a8f8388901749b66a36c0b5e5f2984efcea7e6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:03:46 +0800
Subject: [PATCH] 增加新的websocket,取消中文转化参数功能。

---
 src/main/java/com/moral/service/HistoryMinutelyService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 1904618..35be96b 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -34,10 +34,10 @@
 
     List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters) throws Exception;
 
-    List<Map<String,Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;
+    List<Map<String, Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;
 
     List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters) throws Exception;
 
-    List<Map<String,Object>> getFiveMinutesDataByMacsAndTime(Map<String,Object> parameters);
+    List<Map<String, Object>> getAllDeviceDataToExcel(Map<String, Object> parameters) throws Exception;
 
 }

--
Gitblit v1.8.0