From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-common/src/main/java/com/zhitan/common/utils/ChartUtils.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/zhitan-common/src/main/java/com/zhitan/common/utils/ChartUtils.java b/zhitan-common/src/main/java/com/zhitan/common/utils/ChartUtils.java
index a099168..50ef51b 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/utils/ChartUtils.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/utils/ChartUtils.java
@@ -24,6 +24,20 @@
public static void generateDateList(String timeType, String timeCode, List<Date> dateList) {
Date now = new Date();
switch (timeType) {
+ case TimeTypeConst.TIME_TYPE_HOUR:
+ if (!timeCode.contains(CommonConst.SINGLE_MINUS_SIGN)) {
+ timeCode = DateTimeUtil.toDateTimeStr(timeCode, DateTimeUtil.COMMON_PATTERN_HOUR, DateTimeUtil.COMMON_PATTERN_TO_HOUR);
+ }
+ int minute = 59;
+ for (int i = CommonConst.DIGIT_0; i <= minute; i++) {
+ String tempCode = timeCode + ":0" + i;
+ if(i>9){
+ tempCode = timeCode + ":" + i;
+ }
+ Date tempD = DateTimeUtil.toDateTime(tempCode, DateTimeUtil.COMMON_PATTERN_END_WITH_MINUTE);
+ dateList.add(tempD);
+ }
+ break;
case TimeTypeConst.TIME_TYPE_DAY:
if (!timeCode.contains(CommonConst.SINGLE_MINUS_SIGN)) {
timeCode = DateTimeUtil.toDateTimeStr(timeCode, DateTimeUtil.COMMON_PATTERN_DAY, DateTimeUtil.COMMON_PATTERN_TO_DAY);
--
Gitblit v1.9.3