From de0da7fedd0474fa8f78c592f86216d3d50407f0 Mon Sep 17 00:00:00 2001
From: zt916916 <1903964620@qq.com>
Date: 星期四, 27 三月 2025 11:33:25 +0800
Subject: [PATCH] Revert "支路用能分析"
---
zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java b/zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java
index c359f6a..3299e26 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java
@@ -803,10 +803,10 @@
public static List<TypeTime> getDateTimeList(String timeType, Date dataTime) {
List<TypeTime> resultList = new ArrayList<>();
-
- Date beginTime = DateUtil.beginOfDay(dataTime);
+ Date beginTime;
switch (timeType) {
case TimeTypeConst.TIME_TYPE_HOUR:
+ beginTime = DateUtil.beginOfDay(dataTime);
for (int i = 1; i <= 24; i++) {
TypeTime typeTime = new TypeTime();
typeTime.setDataTime(DateUtil.format(beginTime, COMMON_PATTERN));
@@ -818,6 +818,7 @@
}
break;
case TimeTypeConst.TIME_TYPE_DAY:
+ beginTime = DateUtil.beginOfMonth(dataTime);
for (int i = 1; i <= 31; i++) {
TypeTime typeTime = new TypeTime();
typeTime.setDataTime(DateUtil.format(beginTime, COMMON_PATTERN));
@@ -829,6 +830,7 @@
}
break;
case TimeTypeConst.TIME_TYPE_MONTH:
+ beginTime = DateUtil.beginOfYear(dataTime);
for (int i = 1; i <= 12; i++) {
TypeTime typeTime = new TypeTime();
typeTime.setDataTime(DateUtil.format(beginTime, COMMON_PATTERN));
--
Gitblit v1.9.3