From a7181383bbd5475e7dcbd1fcd29020521c85d58d Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Thu, 12 Sep 2024 15:58:25 +0800
Subject: [PATCH] fix:交办单时间修改提交
---
screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 b13c340..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,9 @@
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;
import java.util.List;
@@ -101,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: ���������������������������������������
@@ -123,5 +135,17 @@
Double calculatedValue(List<HistoryHourly> list, String sensorCode, String type, Double lower, Double upper);
- boolean historyHourly();
+ 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