From f4ab89e7032bea8d3c7e05a44946c3fdb58b7473 Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Tue, 27 Sep 2022 11:15:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
index b6aec9d..0c87a8c 100644
--- a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
@@ -99,6 +99,13 @@
List<HistoryHourly> getValueByMacs(List<String> macs, String time);
/**
+ * @param macs List<String>
+ * @param time String ������2021-12-23
+ * @description: ���������������������������������������
+ */
+ List<HistoryHourly> getHourlyDataByMacs(List<String> macs, String time);
+
+ /**
* @param list ������
* @param sensorCode ������code
* @param type ���������������������������������max���������������min���������������sum���������������avg���
--
Gitblit v1.8.0