From e1ec365640eefdcb06abb1d73da0d80367f79be3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 06 一月 2025 09:13:25 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 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 a879505..2d9f2ef 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
@@ -1292,6 +1292,25 @@
return now.getTime();
}
+
+ /**
+ * 鑾峰彇X澶╁悗鐨勬棩鏈�
+ * @param date
+ * @param days
+ * @return
+ */
+ public static Date getXDayAfterDate(Date date, int days) {
+ if(date ==null){
+ date = new Date();
+ }
+ Calendar now = Calendar.getInstance();
+ now.setTime(date);
+ now.set(Calendar.DATE, now.get(Calendar.DATE) + days);
+ return now.getTime();
+ }
+
+
+
/**
* 寰楀埌涓や釜鏃ユ湡涔嬮棿鐩稿樊鐨勫ぉ鏁�
*
@@ -1949,13 +1968,13 @@
}
/**
- * 寰楀埌褰撳墠鏃ユ湡鏃堕棿,鏍煎紡涓簓yyy-MM-dd hh:mm:ss.
+ * 寰楀埌褰撳墠鏃ユ湡鏃堕棿,鏍煎紡涓簓yyy-MM-dd HH:mm:ss.
*
* @return String
*/
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);
}
@@ -2832,7 +2851,8 @@
// System.out.println(DateUtil.afterMinutesDate(-5));
- DateUtil.getBeforDays(new Date(),7);
+ System.out.println(DateUtil.getPlusTime2( new Date() ));
+ System.out.println(DateUtil.getPlusTime2(addMonthToDate(new Date(),3)));
// Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
// Date endTime = DateUtil.StringToDate("2024-05-01 17:00:00" ,"yyyy-MM-dd HH:mm:ss");
@@ -3036,6 +3056,19 @@
calendar.add(Calendar.DATE, days);//
return calendar.getTime();
}
+ public static Date addYearToDate(Date date, int yeas) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.add(Calendar.YEAR, yeas);//
+ return calendar.getTime();
+ }
+ public static Date addMonthToDate(Date date, int num) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.add(Calendar.MONTH, num);//
+
+ return calendar.getTime();
+ }
public static String afterDateToStr(Integer days){
Date date = new Date();
--
Gitblit v1.9.3