From 11d10fc9ca90ec29159738c1eac5e2d9203d8bb6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 28 Jul 2021 09:14:12 +0800
Subject: [PATCH] screen-api kafka消费者组id从配置文件获取 screen-manage 除admin角色外无法查看admin角色
---
screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java b/screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
index 58e3e02..0021494 100644
--- a/screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
@@ -6,6 +6,7 @@
import com.moral.api.pojo.form.historyFiveMinutely.QueryDeviceAndFiveMinuteDataForm;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -25,4 +26,16 @@
* @Date: 2021/7/16
*/
List<DeviceAndFiveMinuteDataDTO> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form);
+
+ /**
+ * @Description: ������������������������������������������
+ * @Param: [mac]
+ * @return: java.util.List<com.moral.api.entity.HistoryFiveMinutely>
+ * @Author: ���������
+ * @Date: 2021/7/23
+ */
+ HistoryFiveMinutely queryLastDataByMac(String mac);
+
+ //������5������������������
+ List<Object> getAreaWindData(Map<String,Object> params);
}
--
Gitblit v1.8.0