From f95325fd2635a9af08c0acac70e70379978d128a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 10 七月 2023 19:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/util/DateTimeHelper.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/util/DateTimeHelper.java b/cloud-server-course/src/main/java/com/dsh/course/util/DateTimeHelper.java
index ea6f35b..97688c4 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/util/DateTimeHelper.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/util/DateTimeHelper.java
@@ -2,9 +2,8 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.time.*;
+import java.time.temporal.TemporalAdjusters;
import java.util.*;
@@ -1757,13 +1756,20 @@
return list;
}
- /*public static void main(String[] args) throws ParseException {
- List<Date> allTheDateOftheMonth = getAllTheDateOftheMonth(new Date());
- Date date = allTheDateOftheMonth.get(11);
- System.out.println(date.toLocaleString());
- int i = daysBetween(new Date(), date);
- System.out.println(i);
- }*/
+ public static Date getTodayTime(){
+ // 获取当天的开始时间（0点）
+ LocalDate today = LocalDate.now();
+ LocalDateTime startOfDay = LocalDateTime.of(today, LocalTime.MIN);
+ return Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
+ }
+
+ public static Date getWeekOfLastDay(){
+ // 获取本周的最后一天的时间（23点59分59秒）
+ LocalDate today = LocalDate.now();
+ LocalDate lastDayOfWeek = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
+ LocalDateTime endOfDay = LocalDateTime.of(lastDayOfWeek, LocalTime.MAX);
+ return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+ }
}
--
Gitblit v1.7.1