From db0f521bf51f96029090ebc01dfa96fc163127a1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 15 十一月 2024 18:29:03 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 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 8b3ec51..f1d341b 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
@@ -86,7 +86,7 @@
date = date.substring(0,i);
}
}
- //TimeZone tz = TimeZone.getTimeZone("GMT-01");
+ //TimeZone tz = TimeZone.getTimeZone("GMT-01");2024-10-21T10:40:04+08:00
DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
// DateFormat df = new SimpleDateFormat("2023-12-08 T 09:25:54.698+08:00");
df.setTimeZone(tz);
@@ -345,6 +345,25 @@
}
+
+
+ public static List<String> getBeforDays(Date currentDate,Integer days){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ 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,"yyyy-MM-dd"));
+ System.out.println(DateUtil.dateToString(startDate,"yyyy-MM-dd"));
+ }
+ return list;
+ }
+
/**
* Descrption:鍙栧緱褰撳墠鏃ユ湡鏃堕棿,鏍煎紡涓�:YYYYMMDDHHMISS
*
@@ -441,7 +460,7 @@
* @return String
* @throws Exception
*/
- public static String getPlusTime(Date date) throws Exception {
+ public static String getPlusTime(Date date) {
if (date == null)
return null;
try {
@@ -1264,6 +1283,9 @@
* @return
*/
public static Date getXMinuteAfterDate(Date date, int minute) {
+ if(date ==null){
+ date = new Date();
+ }
Calendar now = Calendar.getInstance();
now.setTime(date);
now.set(Calendar.MINUTE, now.get(Calendar.MINUTE) + minute);
@@ -2803,7 +2825,7 @@
// System.out.println(DateUtil.afterMinutesDate(-5));
- DateUtil.getBeforMonth(new Date(),12);
+ DateUtil.getBeforDays(new Date(),7);
// 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");
--
Gitblit v1.9.3