From 2a212f983f35e1c569dfec3a172fb5f0c9f85fac Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 06 十二月 2022 13:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
index 1003da6..733cf73 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -926,11 +926,13 @@
}
public static void main(String[] args) throws Exception {
- Date date= getLastMonthFirst();
- Date after = getLastMonthEnd();
- System.out.println(date);
- System.out.println(after);
- System.out.println(getMonthTwentyDay());
+// List<String> beforeDays = getBeforeDays(15);
+// System.out.println(beforeDays);
+ List<String> yearMonths = getYearMonths();
+ System.out.println(yearMonths);
+ List<String> latest12Month = getLatest12Month(LocalDate.now(), 10);
+ System.out.println(latest12Month);
+
}
/**
@@ -1174,4 +1176,46 @@
}
}
+
+ public static List<String> getBeforeDays(int before) {
+ List<String> dates = new ArrayList<>();
+ for (int i = before; i >= 0; i--) {
+ dates.add(getBeforeDay(i));
+ }
+ return dates;
+ }
+
+ /**
+ * 获取当年所有月份
+ *
+ * @return
+ */
+ public static List<String> getYearMonths() {
+ Calendar instance = Calendar.getInstance();
+ int year = instance.get(Calendar.YEAR);
+ List<String> months = new ArrayList<>();
+ for (int i = 1; i <= 12; i++) {
+ String result = String.valueOf(year);
+ if (i < 10) {
+ result = result + "-0" +i;
+ } else {
+ result = result + "-"+i;
+ }
+ months.add(result);
+ }
+ return months;
+ }
+
+ //获取当前12个月
+ public static List<String> getLatest12Month(LocalDate date,int num){
+ List<String> monthList = new ArrayList<>();
+ for(int i = 0;i <= num-1; i++){
+ LocalDate localDate = date.minusMonths(i);
+ String month = localDate.toString().substring(0,7);
+ monthList.add(month);
+ }
+ return monthList;
+ }
+
+
}
--
Gitblit v1.7.1