From d2ab6f7153e604bac7bc4ad58f27f368b65d8a1e Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 16 六月 2026 13:54:58 +0800
Subject: [PATCH] feat: 添加能耗数据综合分析功能，支持按天和周维度的趋势分析
---
src/main/java/com/ruoyi/http/util/StatisticEleAggregateUtil.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/http/util/StatisticEleAggregateUtil.java b/src/main/java/com/ruoyi/http/util/StatisticEleAggregateUtil.java
index dc3b133..4ff014f 100644
--- a/src/main/java/com/ruoyi/http/util/StatisticEleAggregateUtil.java
+++ b/src/main/java/com/ruoyi/http/util/StatisticEleAggregateUtil.java
@@ -34,6 +34,7 @@
String monthKey = HOUR_TO_MONTH.apply(tk);
return monthKey != null ? toQuarterKey(monthKey) : null;
};
+ public static final Function<String, String> HOUR_TO_WEEK = StatisticEleAnalyticsUtil.HOUR_TO_WEEK;
/**
* 鎸夋椂闂存《姹囨�伙紙澶氱數琛ㄥ悎骞讹紝鐢ㄤ簬鍥捐〃锛�
@@ -178,6 +179,7 @@
return switch (dimension) {
case "hour" -> new HourRange(startTime, endTime);
case "day" -> new HourRange(startTime + "00", endTime + "23");
+ case "week" -> new HourRange(startTime + "00", endTime + "23");
case "month" -> new HourRange(startTime + "0100", endTime + lastDayOfMonth(endTime) + "23");
case "year" -> new HourRange(startTime + "010100", endTime + "123123");
case "quarter" -> new HourRange(
@@ -234,6 +236,7 @@
return switch (dimension) {
case "hour" -> HOUR_TO_HOUR;
case "day" -> HOUR_TO_DAY;
+ case "week" -> HOUR_TO_WEEK;
case "month" -> HOUR_TO_MONTH;
case "quarter" -> HOUR_TO_QUARTER;
case "year" -> HOUR_TO_YEAR;
--
Gitblit v1.9.3