From cc3c6537dcd5bc7b8eb98046dfcaf0ad93484d60 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 20 十一月 2025 16:12:20 +0800
Subject: [PATCH] 钥匙柜大屏
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 128 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 122 insertions(+), 6 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..73c174b 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
@@ -178,6 +177,26 @@
m_intervalday = m_intervalday / 1000 / 60 / 60;// 璁＄畻鎵�寰楃殑澶╂暟
return m_intervalday + 1;
+ } catch (Exception e) {
+ return Integer.MIN_VALUE;
+ }
+ }
+
+
+ /**
+ * 鑾峰彇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;
}
@@ -384,6 +403,25 @@
}
return list;
}
+
+
+ public static List<String> getBeforDaysByFormat(Date currentDate,Integer days,String format){
+ SimpleDateFormat sdf = new SimpleDateFormat(format);
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(currentDate);
+ Date endDate = currentDate; // 鑾峰彇褰撳墠鏃ユ湡
+ calendar.add(Calendar.DAY_OF_YEAR, -days); // 寰�鍓嶆帹7澶�
+ Date startDate = calendar.getTime(); // 鑾峰彇鎺ㄧ畻鍚庣殑鏃ユ湡
+ List<String> list = new ArrayList<>();
+ while (startDate.before(endDate)) {
+ calendar.add(Calendar.DAY_OF_YEAR, 1); // 鑾峰彇涓嬩竴澶╂棩鏈�
+ startDate = calendar.getTime();
+ list.add(DateUtil.dateToString(startDate,format));
+ System.out.println(DateUtil.dateToString(startDate,format));
+ }
+ return list;
+ }
+
public static List<Date> getDateListBeforDays(Date currentDate,Integer days){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
@@ -671,6 +709,27 @@
} catch (Exception e) {
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;
}
/**
@@ -1712,11 +1771,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";
@@ -2034,7 +2104,7 @@
*/
public static String getCurrDateTime() {
Timestamp date = new Timestamp(System.currentTimeMillis());
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return formatter.format(date);
}
@@ -2465,6 +2535,16 @@
}
try {
return sdfLongTimePlus.parse(strDate);
+ } catch (Exception ex) {
+ 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 +2990,10 @@
// Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
// System.out.println(DateUtil.afterMinutesDate(-5));
+ System.out.println(DateUtil.getISO8601DateByStr("2025-11-12T09:13:00.000Z"));
- 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){
@@ -3051,7 +3132,6 @@
String temp = sdf.format(date);
String firstDayInMoth = "";
firstDayInMoth = temp + "-01";
-
return firstDayInMoth;
}
@@ -3076,6 +3156,26 @@
return weekDays[w];
}
+ /**
+ * 鑾峰彇褰撳墠鏃ユ湡鏄槦鏈熷嚑<br>
+ *
+ * @param dt
+ * @return 褰撳墠鏃ユ湡鏄槦鏈熷嚑
+ */
+ public static String getWeekZhouOfDate(Date dt) {
+ String[] weekDays = { "鍛ㄦ棩", "鍛ㄤ竴", "鍛ㄤ簩", "鍛ㄤ笁", "鍛ㄥ洓", "鍛ㄤ簲", "鍛ㄥ叚" };
+ TimeZone china = TimeZone.getTimeZone("Asia/Shanghai");
+ Calendar cal = Calendar.getInstance(china);
+ cal.setTime(dt);
+
+ int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+ if (w < 0)
+ {
+ w = 0;
+ }
+
+ return weekDays[w];
+ }
/**
* 鑾峰彇鏄熸湡鏁�
*
@@ -3523,6 +3623,13 @@
return getDayEndTime(cal.getTime());
}
+ public static String getDateStrOfUTCStr(String utcDate){
+ ZonedDateTime utcTime = ZonedDateTime.parse(utcDate,
+ DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssX").withZone(ZoneId.of("UTC")));
+ // 杞崲涓哄寳浜椂闂�
+ ZonedDateTime beijingTime = utcTime.withZoneSameInstant(ZoneId.of("Asia/Shanghai"));
+ return beijingTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ }
// 鑾峰彇褰撳ぉ鐨勫紑濮嬫椂闂�
public static java.util.Date getDayBegin() {
Calendar cal = new GregorianCalendar();
@@ -3581,4 +3688,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