From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 123 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 120 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 138be2b..894d2d5 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
@@ -317,7 +317,6 @@
}
}
-
/**
* 鑾峰彇X鏈堜唤涔嬪墠鐨勬湀浠芥暟
* @param currentDate
@@ -343,9 +342,31 @@
}
return list;
}
+ /**
+ * 鑾峰彇X鏈堜唤涔嬪墠鐨勬湀浠芥暟
+ * @param currentDate
+ * @param month
+ * @return
+ */
+ public static List<String> getDateListBeforMonth(Date currentDate , Integer month) {
+ SimpleDateFormat sdfYear = new SimpleDateFormat("yyyy");
+ SimpleDateFormat sdfMonth = new SimpleDateFormat("MM");
+ int currentYear = Integer.parseInt(sdfYear.format(currentDate));
+ int currentMonth = Integer.parseInt(sdfMonth.format(currentDate));
+ List<String> list = new ArrayList<>();
+ for (int i = 0; i < month; i++) {
+ int tempYear = currentYear;
+ int tempMonth = currentMonth - i;
-
+ if (tempMonth <= 0) {
+ tempYear--;
+ tempMonth += 12;
+ }
+ list.add(tempYear +"-" + StringUtils.leftPad(Integer.toString(tempMonth),2,"0"));
+ }
+ return list;
+ }
public static List<String> getBeforDays(Date currentDate,Integer days){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -360,6 +381,21 @@
startDate = calendar.getTime();
list.add(DateUtil.dateToString(startDate,"yyyy-MM-dd"));
System.out.println(DateUtil.dateToString(startDate,"yyyy-MM-dd"));
+ }
+ return list;
+ }
+ public static List<Date> getDateListBeforDays(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<Date> list = new ArrayList<>();
+ while (startDate.before(endDate)) {
+ calendar.add(Calendar.DAY_OF_YEAR, 1); // 鑾峰彇涓嬩竴澶╂棩鏈�
+ startDate = calendar.getTime();
+ list.add(startDate);
}
return list;
}
@@ -1638,6 +1674,49 @@
return "";
}
}
+ public static List<Date> getThisMonthDateList() {
+ List<Date> dateList = new ArrayList<>();
+ try {
+ Calendar calendar = Calendar.getInstance();
+ int daysInMonth = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+ calendar.set(Calendar.HOUR,0);
+ calendar.set(Calendar.MINUTE,0);
+ calendar.set(Calendar.SECOND,0);
+ calendar.set(Calendar.MILLISECOND,0);
+ for (int i = 0; i < daysInMonth; i++) {
+ calendar.set(Calendar.DAY_OF_MONTH,i+1);
+ dateList.add(calendar.getTime());
+ }
+ } catch (Exception e) {
+ return null;
+ }
+ return dateList;
+ }
+ public static List<Date> getThisYearMonthList() {
+ List<Date> dateList = new ArrayList<>();
+ try {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_MONTH,1);
+ calendar.set(Calendar.HOUR,0);
+ calendar.set(Calendar.MINUTE,0);
+ calendar.set(Calendar.SECOND,0);
+ calendar.set(Calendar.MILLISECOND,0);
+ for (int i = 0; i < 12; i++) {
+ calendar.set(Calendar.MONTH,i);
+ dateList.add(calendar.getTime());
+ }
+ } catch (Exception e) {
+ return null;
+ }
+ return dateList;
+ }
+ public static Date getFirstThisYearDate() {
+ try {
+ return sdfShort.parse( getNowShortDate().substring(0, 4) + "0101");
+ } catch (Exception e) {
+ return null;
+ }
+ }
public static String getFirstDayCurrentMonth() {
try {
return getDateLong(new Date()).substring(0, 7) + "-01";
@@ -2832,7 +2911,17 @@
// System.out.println(DateUtil.afterMinutesDate(-5));
- DateUtil.getBeforDays(new Date(),7);
+ System.out.println(DateUtil.getBeforMonthStr(new Date(),1));
+ System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
+
+// List<Date> list =getThisMonthDateList();
+// for(Date d :list){
+// System.out.println(getPlusTime2(d));
+// }
+// List<Date> list1 =getThisYearMonthList();
+// for(Date d :list1){
+// System.out.println(getPlusTime2(d));
+// }
// 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");
@@ -3303,4 +3392,32 @@
}
+ /**
+ * 鑾峰彇X澶╁悗鐨勬棩鏈�
+ * @param date
+ * @param beforMonths 涓嬫湀 -1 涓婃湀 1
+ * @return
+ */
+ public static String getBeforMonthStr(Date date,Integer beforMonths){
+ ZonedDateTime zonedDateTime = date.toInstant().atZone(ZoneId.systemDefault());
+ // 杞崲涓簀ava.time.LocalDate,璁＄畻x澶╃殑鏃ユ湡
+ LocalDate dateBeforeDay = zonedDateTime.toLocalDate().minusMonths(beforMonths);
+ return dateBeforeDay.toString();
+ }
+
+
+ /**
+ * 鑾峰彇X骞村悗鐨勬棩鏈�
+ * @param date
+ * @param beforMonths 涓嬪勾 -1 涓婂勾 1
+ * @return
+ */
+ public static String getBeforYear(Date date,Integer beforMonths){
+ ZonedDateTime zonedDateTime = date.toInstant().atZone(ZoneId.systemDefault());
+ // 杞崲涓簀ava.time.LocalDate,璁＄畻x澶╃殑鏃ユ湡
+ LocalDate dateBeforeDay = zonedDateTime.toLocalDate().minusYears(beforMonths);
+ return dateBeforeDay.toString();
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3