From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 3 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 b521c92..7f2fc50 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
@@ -672,6 +672,27 @@
throw e;
}
}
+ public static String getTimeStrBySecond(Long seconds) {
+ String returnTime ="0鏃�0鍒�0绉�";
+ long longHour = 0;
+ long longMinu = 0;
+ long longSec =seconds ==null?0:seconds;
+ try {
+ if (longSec == 0) {
+ returnTime = "0鏃�0鍒�0绉�";
+ return returnTime;
+ }
+ longHour = longSec / 3600; // 鍙栧緱灏忔椂鏁�
+ longSec = longSec % 3600; // 鍙栧緱浣欎笅鐨勭
+ longMinu = longSec / 60; // 鍙栧緱鍒嗘暟
+ longSec = longSec % 60; // 鍙栧緱浣欎笅鐨勭
+ returnTime = longHour + "鏃�" + longMinu + "鍒�" + longSec + "绉�";
+ return returnTime;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return returnTime;
+ }
/**
* Descrption:鍙栧緱褰撳墠鏃ユ湡,鏍煎紡涓�:yyyy-MM-dd HH:mm:ss
@@ -1712,11 +1733,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";
@@ -2469,6 +2501,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;
+ }
+ }
// -----------------------------------------------------------------------
@@ -2910,9 +2952,10 @@
// 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.getBeforMonthStr(new Date(),1));
- System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
+// System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
+// System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
// List<Date> list =getThisMonthDateList();
// for(Date d :list){
@@ -3076,6 +3119,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];
+ }
/**
* 鑾峰彇鏄熸湡鏁�
*
@@ -3581,4 +3643,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