From 65b70cf13a2ec91013d876771be878c165cae3a4 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Tue, 23 Apr 2024 15:32:45 +0800
Subject: [PATCH] fix:补充提交

---
 screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java |   23 +++++++++++++++++++++++
 1 files changed, 23 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 042f18f..5d1f62f 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
@@ -1,6 +1,8 @@
 package com.moral.api.service;
 
 import com.moral.api.entity.HistoryHourly;
+import com.moral.api.entity.HistoryMinutely;
+import com.moral.api.pojo.vo.historyMonthly.HistoryResultVo;
 import com.moral.api.vo.HistoryHourlyVo;
 
 import java.util.Date;
@@ -102,6 +104,15 @@
     List<HistoryHourly> getValueByMacAndTime(List<String> mac, Date startDate, Date endDate);
 
     /**
+     * @Description: ������mac���������������������������
+     * @Param: [mac, startDate, endDate]
+     * @return: java.util.List<com.moral.api.entity.HistoryHourly>
+     * @Author: ���������
+     * @Date: 2021/9/28
+     */
+    List<HistoryResultVo> getAvgValueByMacAndTime(List<String> mac,String type, Date startDate, Date endDate);
+
+    /**
      * @param macs List<String>
      * @param time String ������2021-12-23
      * @description: ���������������������������������������
@@ -125,4 +136,16 @@
 
 
     boolean historyHourly(HistoryHourlyVo historyHourlyVo);
+
+
+
+    /**
+     * @Description: ������������mac���������������������������������
+     * @Param: [mac, startDate, endDate]
+     * @return: java.util.Map<java.lang.String,com.moral.api.entity.HistoryDaily>
+     * @Author: ���������
+     * @Date: 2021/9/26
+     */
+    List<HistoryMinutely> getHistoryMinutely(String mac, Date startDate, Date endDate);
+
 }

--
Gitblit v1.8.0