From a8993d54a33db030fc17649777062f76043be7ea Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期四, 20 三月 2025 21:41:38 +0800
Subject: [PATCH] Merge pull request #18 from Andy-Yin/develop1.0
---
zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 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 248cb2f..48091c1 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
@@ -10,10 +10,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
+import java.util.*;
/**
* @Description: 鏃堕棿宸ュ叿绫�
* @author: yxw
@@ -745,4 +742,42 @@
}
return momDate;
}
+ public static List<TypeTime> getDateTimeList(String timeType,Date dataTime){
+ List<TypeTime> resultlist = new ArrayList<>();
+ Date beginTime = DateUtil.beginOfDay(dataTime);
+ switch (timeType){
+ case TimeTypeConst.TIME_TYPE_DAY:
+ for(int i = 0;i<24;i++){
+ TypeTime typeTime = new TypeTime();
+ typeTime.setDataTime(DateUtil.format(beginTime,COMMON_PATTERN));
+ typeTime.setDateTime(DateTimeUtil.toDateTime(typeTime.getDataTime()));
+ typeTime.setTimeCode(CommonConst.WORD_H + DateUtil.format(beginTime,COMMON_PATTERN_HOUR));
+ typeTime.setValue("value" + i);
+ resultlist.add(typeTime);
+ beginTime = addHours(beginTime,1);
+ }
+ break;
+ case TimeTypeConst.TIME_TYPE_MONTH:
+ for(int i = 0;i<31;i++){
+ TypeTime typeTime = new TypeTime();
+ typeTime.setDataTime(DateUtil.format(beginTime,COMMON_PATTERN));
+ typeTime.setTimeCode(CommonConst.WORD_D + DateUtil.format(beginTime,COMMON_PATTERN_DAY));
+ typeTime.setValue("value" + i);
+ resultlist.add(typeTime);
+ beginTime = addHours(beginTime,1);
+ }
+ break;
+ case TimeTypeConst.TIME_TYPE_YEAR:
+ for(int i = 0;i<12;i++){
+ TypeTime typeTime = new TypeTime();
+ typeTime.setDataTime(DateUtil.format(beginTime,COMMON_PATTERN));
+ typeTime.setTimeCode(CommonConst.WORD_M + DateUtil.format(beginTime,COMMON_PATTERN_MONTH));
+ typeTime.setValue("value" + i);
+ resultlist.add(typeTime);
+ beginTime = addHours(beginTime,1);
+ }
+ break;
+ }
+ return resultlist;
+ }
}
--
Gitblit v1.9.3