From 70ac6517f3e343ae59454c045eebf984fc6562b7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 19 十二月 2025 09:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index d989500..6fe5dc6 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -16,7 +16,6 @@
import cn.hutool.core.date.DateUnit;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
-
/**
* 鏃ユ湡宸ュ叿绫�
* @author: jiangping
@@ -2968,11 +2967,25 @@
public static void main(String[] args) {
try {
+
+ LocalDate today = LocalDate.now();
+
+ // 鑾峰彇褰撳墠鏃ユ湡鏄槦鏈熷嚑
+ DayOfWeek dayOfWeek = today.getDayOfWeek();
+
+ // 璁＄畻鍛ㄤ竴鍜屽懆浜旂殑鏃ユ湡
+ LocalDate monday = today.with(DayOfWeek.MONDAY);
+ LocalDate friday = today.with(DayOfWeek.FRIDAY);
+
+ // 杈撳嚭鍛ㄤ竴鍜屽懆浜旂殑鏃ユ湡
+ System.out.println("Monday: " + monday.toString());
+ System.out.println("Friday: " + friday.toString());
+
// Date date = getISO8601DateByStr("2024-04-15T07:46:36.014+08:00");
// Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
// System.out.println(DateUtil.afterMinutesDate(-5));
- System.out.println(DateUtil.getFirstThisMonthDate());
+// System.out.println(DateUtil.getWeekZhouOfDate(getDateFromString2("2025-11-06 00:00:00")));
// System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
// System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
@@ -3114,7 +3127,6 @@
String temp = sdf.format(date);
String firstDayInMoth = "";
firstDayInMoth = temp + "-01";
-
return firstDayInMoth;
}
@@ -3147,7 +3159,8 @@
*/
public static String getWeekZhouOfDate(Date dt) {
String[] weekDays = { "鍛ㄦ棩", "鍛ㄤ竴", "鍛ㄤ簩", "鍛ㄤ笁", "鍛ㄥ洓", "鍛ㄤ簲", "鍛ㄥ叚" };
- Calendar cal = Calendar.getInstance();
+ TimeZone china = TimeZone.getTimeZone("Asia/Shanghai");
+ Calendar cal = Calendar.getInstance(china);
cal.setTime(dt);
int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
--
Gitblit v1.9.3