From f9f8f90ac63d6ce3274410d3721b173f40db6e41 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 14:12:48 +0800
Subject: [PATCH] chore:过滤海城小时数据

---
 screen-common/src/main/java/com/moral/util/DateUtils.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 59 insertions(+), 0 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 2741da9..e725576 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -80,6 +80,10 @@
      * ������������(yyyy-MM-dd HH)
      * */
     public static final String yyyy_MM_dd_HH_EN = "yyyy-MM-dd HH";
+    /*
+     * ������������(MM-dd)
+     * */
+    public static final String MM_dd_EN = "MM-dd";
 
     /*
      * Date���toString������
@@ -503,6 +507,14 @@
         }
     }
 
+    public static boolean isTimeBeforE(Date nows, Date date) {
+        long hous = nows.getTime() - date.getTime();
+        if (hous >= 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
     /**
      * ������������������������������������������������������
      *
@@ -618,6 +630,22 @@
         return dateToDateString(now.getTime(), formatStr);
     }
 
+
+    /**
+     * ������������������day���������������(formatStr)������������
+     *
+     * @param date
+     * @param date,
+     * @param hours
+     * @return
+     */
+    public static Date getDateAddHour(Date date,int hours) {
+        Calendar now = Calendar.getInstance(TimeZone.getDefault());
+        now.setTime(date);
+        now.add(Calendar.HOUR_OF_DAY, hours);
+        return now.getTime();
+    }
+
     /**
      * @Description: ������������������day���������������
      * @Param: [date, day]
@@ -650,6 +678,8 @@
         }
         return new Date();
     }
+
+
 
     public static String getAfterNDays(Date date, int n, String formateStr) {
         SimpleDateFormat sdf = new SimpleDateFormat(formateStr);
@@ -1017,6 +1047,19 @@
         return year == currentYear;
     }
 
+    /*
+     * ���������������������������
+     * */
+    public static boolean isCurrentMonth(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        int currentYear = cal.get(Calendar.MONTH);
+        cal.setTime(date);
+        int year = cal.get(Calendar.MONTH);
+        return year == currentYear;
+    }
+
+
     /**
      * ������������������������������
      *
@@ -1024,6 +1067,14 @@
      */
     public static Date getLastDayOfCurrMonth() {
         Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.MONTH, 1);
+        cal.set(Calendar.DAY_OF_MONTH, 0);
+        return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
+    }
+
+    public static Date getLastDayOfCurrMonth(Date time) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(time);
         cal.add(Calendar.MONTH, 1);
         cal.set(Calendar.DAY_OF_MONTH, 0);
         return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
@@ -1431,6 +1482,14 @@
         return calendar.getTime();
     }
 
+    //������������
+    public static Date addYears(Date date, int years) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.YEAR, years);
+        return calendar.getTime();
+    }
+
     /**
      * <p>
      * Title: getDays

--
Gitblit v1.8.0