From f62ce761a5c2dd1f281acbf72a66fd752af3d75d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 23 Jul 2021 14:19:51 +0800
Subject: [PATCH] 设备状态判断更新

---
 screen-common/src/main/java/com/moral/util/DateUtils.java |   89 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 72 insertions(+), 17 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 cbc63a2..8e61079 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";
@@ -67,6 +71,14 @@
      * ������������(HH:mm:ss)
      */
     public static final String HH_mm_ss_EN = "HH:mm:ss";
+    /*
+     * ������������(yyyy-MM-dd HH:mm)
+     * */
+    public static final String yyyy_MM_dd_HH_mm_EN = "yyyy-MM-dd HH:mm";
+    /*
+     * ������������(yyyy-MM-dd HH)
+     * */
+    public static final String yyyy_MM_dd_HH_EN = "yyyy-MM-dd HH";
     /**
      * DateFormat������
      */
@@ -443,14 +455,14 @@
     }
 
     /**
-    * @Description: ������������������day���������������
-            * @Param: [date, day]
-            * @return: java.util.Date
-            * @Author: ���������
-            * @Date: 2021/3/30
-            */
+     * @Description: ������������������day���������������
+     * @Param: [date, day]
+     * @return: java.util.Date
+     * @Author: ���������
+     * @Date: 2021/3/30
+     */
     public static Date getDateOfDay(Date date, int day) {
-        if(date==null)
+        if (date == null)
             return null;
         Calendar now = Calendar.getInstance(TimeZone.getDefault());
         now.setTime(date);
@@ -738,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));
@@ -753,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
@@ -761,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));
     }
 
     /**
@@ -773,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));
@@ -1293,11 +1315,44 @@
         return date;
     }
 
+    //���������������������������������
+    public static Date dataToTimeStampTime(Date time, String dateFormat) {
+        String dateString = dateToDateString(time, dateFormat);
+        try {
+            return getDateFormat(dateFormat).parse(dateString);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
-    public static void main(String[] args) throws InterruptedException {
-        Date date1 = new Date();
-        Thread.sleep(1000);
-        Date date2 = new Date();
-        System.out.println(DateUtils.compareDateStr(date1, date2));
+    //���������������
+    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;
     }
 }

--
Gitblit v1.8.0