From c9570f9f0e7f0e615e68b3d471307fd74d10e8be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 06 Aug 2021 14:36:01 +0800
Subject: [PATCH] update

---
 screen-common/src/main/java/com/moral/util/DateUtils.java |   94 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/util/DateUtils.java b/screen-common/src/main/java/com/moral/util/DateUtils.java
index f5ecd8a..9281bed 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -16,6 +16,10 @@
 
 public class DateUtils {
     /**
+     * ������������(yyyy)
+     */
+    public static final String yyyy = "yyyy";
+    /**
      * ������������(yyyy-MM-dd)
      */
     public static final String yyyy_MM_dd_EN = "yyyy-MM-dd";
@@ -746,8 +750,8 @@
      * @param days
      * @return
      */
-    public static String getDateAddDay(String date, int days, String format) {
-        DateFormat df = getDateFormat(format);
+    public static String getDateAddDay(String date, int days) {
+        DateFormat df = getDateFormat(yyyy_MM_dd_EN);
         try {
             Calendar cal = Calendar.getInstance();
             cal.setTime(df.parse(date));
@@ -761,6 +765,17 @@
     }
 
     /**
+     * ������������������������
+     *
+     * @return
+     */
+    public static Date getFirstDayOfCurrMonth() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
+    }
+
+    /**
      * ������������������������������
      *
      * @return
@@ -769,8 +784,7 @@
         Calendar cal = Calendar.getInstance();
         cal.add(Calendar.MONTH, 1);
         cal.set(Calendar.DAY_OF_MONTH, 0);
-
-        return cal.getTime();
+        return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
     }
 
     /**
@@ -781,7 +795,7 @@
      * @return
      */
     public static String getDateAddMonth(String date, int m) {
-        DateFormat df = getDateFormat(yyyyMM_EN);
+        DateFormat df = getDateFormat(yyyy_MM_EN);
         try {
             Calendar cal = Calendar.getInstance();
             cal.setTime(df.parse(date));
@@ -1301,12 +1315,6 @@
         return date;
     }
 
-    //������������������������������������
-    public static Date convertDate(Date date) {
-        String dateString = dateToDateString(date, yyyy_MM_dd_HH_mm_EN);
-        return getDate(dateString, yyyy_MM_dd_HH_mm_EN);
-    }
-
     //���������������������������������
     public static Date dataToTimeStampTime(Date time, String dateFormat) {
         String dateString = dateToDateString(time, dateFormat);
@@ -1317,7 +1325,67 @@
         }
     }
 
-    public static void main(String[] args) throws InterruptedException {
-        System.out.println(new Date().getTime());
+    //���������������
+    public static Date getLastWeekMonday() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getDate(getMondayOfThisWeek(), yyyy_MM_dd_EN));
+        cal.add(Calendar.DATE, -7);
+        return cal.getTime();
+    }
+
+    //���������������������
+    public static Date getFirstDayOfLastMonth() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.MONTH, -1);
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        return getDate(dateToDateString(calendar.getTime(), yyyy_MM_dd_EN));
+    }
+
+
+    /*���������������������*/
+    public static String getDateAddYear(String date, int year) {
+        DateFormat df = getDateFormat(yyyy);
+        try {
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(df.parse(date));
+            cal.add(Calendar.YEAR, year);
+            date = df.format(cal.getTime());
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        return date;
+    }
+
+    /*
+    * ������������������������������������
+    * ������time=2021-08-04 ���������������������������������������
+    *    time=2021-08 ���������������������������������
+    * */
+    public static List<String> getTimeLag(String time) {
+        List<String> result = new ArrayList<>();
+        int length = time.length();
+        Calendar cal = Calendar.getInstance();
+        String end;
+        String dateFormat;
+        int i;
+        if (length == 10) {//���
+            end = getDateAddDay(time, 1);
+            dateFormat = yyyy_MM_dd_EN;
+            i = Calendar.HOUR_OF_DAY;
+        } else if (length == 7) {//���
+            end = getDateAddMonth(time, 1);
+            dateFormat = yyyy_MM_EN;
+            i = Calendar.DAY_OF_MONTH;
+        } else {//���
+            end = getDateAddYear(time, 1);
+            dateFormat =yyyy;
+            i = Calendar.MONTH;
+        }
+        cal.setTime(getDate(time, dateFormat));
+        for (long d = cal.getTimeInMillis(); d < getDate(end, dateFormat).getTime(); cal.set(i, cal.get(i) + 1), d = cal.getTimeInMillis()) {
+            String format = dateToDateString(new Date(d));
+            result.add(format);
+        }
+        return result;
     }
 }

--
Gitblit v1.8.0