From f72da3bc5ca43fd37c1f0de15a1e9128a627a563 Mon Sep 17 00:00:00 2001 From: cjl <909710561@qq.com> Date: Thu, 18 Apr 2024 13:59:35 +0800 Subject: [PATCH] fix:日报数据调整 --- screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 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 0c87a8c..3f2c42b 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.vo.HistoryHourlyVo; import java.util.Date; import java.util.List; @@ -92,6 +94,15 @@ List<HistoryHourly> getValueByMacAndTime(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<HistoryHourly> getValueByMacAndTime(List<String> mac, Date startDate, Date endDate); + + /** * @param macs List<String> * @param time String ������2021-12-23 * @description: ��������������������������������������� @@ -113,4 +124,18 @@ */ Double calculatedValue(List<HistoryHourly> list, String sensorCode, String type, Double lower, Double upper); + + 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