From 8f6dfbc2ca4a55a1ce0a4bb62094c4bf5c671b4d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 27 十月 2025 10:57:10 +0800
Subject: [PATCH] 会议室问题修改
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 74 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 2 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 4e27a08..d989500 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
@@ -183,6 +183,26 @@
}
}
+
+ /**
+ * 鑾峰彇2涓椂闂翠箣闂寸殑鍒嗛挓鏁�
+ * @param fromDate
+ * @param toDate
+ * @return
+ */
+ public static long getBetweenMin(Date fromDate, Date toDate) {
+ long m_intervalday = 0;// 鍒濆鍖栨椂闂撮棿闅旂殑鍊间负0
+ // 浣跨敤鐨勬椂闂存牸寮忎负yyyy-MM-dd
+ try {
+ m_intervalday = toDate.getTime() - fromDate.getTime();// 璁＄畻鎵�寰椾负寰鏁�
+ m_intervalday = m_intervalday / 1000 / 60;// 璁＄畻鎵�寰楃殑鍒嗛挓
+
+ return m_intervalday;
+ } catch (Exception e) {
+ return Integer.MIN_VALUE;
+ }
+ }
+
/**
* @author Pablo Descrption:取锟矫碉拷前锟斤拷锟斤拷getgetg get Date format
* Example锛�2008.03.15
@@ -1733,11 +1753,22 @@
}
public static Date getFirstThisYearDate() {
try {
- return sdfShort.parse( getNowShortDate().substring(0, 4) + "0101");
+ return sdfLong.parse( getNowShortDate().substring(0, 4) + "-01-01");
} catch (Exception e) {
return null;
}
}
+
+ public static Date getFirstThisMonthDate() {
+ try {
+ return sdfLong.parse( getNowFormateDate().substring(0, 7) + "-01");
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+
+
public static String getFirstDayCurrentMonth() {
try {
return getDateLong(new Date()).substring(0, 7) + "-01";
@@ -2490,6 +2521,16 @@
return null;
}
}
+ public static Date getDateFromShortString(String strDate) {
+ if (StringUtils.isEmpty(strDate)) {
+ return null;
+ }
+ try {
+ return sdfLong.parse(strDate);
+ } catch (Exception ex) {
+ return null;
+ }
+ }
// -----------------------------------------------------------------------
@@ -2931,8 +2972,9 @@
// 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(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
+// System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
// System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
// List<Date> list =getThisMonthDateList();
@@ -3097,6 +3139,25 @@
return weekDays[w];
}
+ /**
+ * 鑾峰彇褰撳墠鏃ユ湡鏄槦鏈熷嚑<br>
+ *
+ * @param dt
+ * @return 褰撳墠鏃ユ湡鏄槦鏈熷嚑
+ */
+ public static String getWeekZhouOfDate(Date dt) {
+ String[] weekDays = { "鍛ㄦ棩", "鍛ㄤ竴", "鍛ㄤ簩", "鍛ㄤ笁", "鍛ㄥ洓", "鍛ㄤ簲", "鍛ㄥ叚" };
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(dt);
+
+ int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+ if (w < 0)
+ {
+ w = 0;
+ }
+
+ return weekDays[w];
+ }
/**
* 鑾峰彇鏄熸湡鏁�
*
@@ -3602,4 +3663,13 @@
gc.setTime(date);
return gc.get(2) + 1;
}
+
+ public static int getNowDayNum(){
+ // 鑾峰彇Calendar瀹炰緥
+ Calendar calendar = Calendar.getInstance();
+ return calendar.get(Calendar.DAY_OF_MONTH);
+ }
+
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3