From 6450fec60b8dc7e6d31779bcfe3b23b3f665ebaf Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 28 Dec 2021 15:08:45 +0800
Subject: [PATCH] screen-api            更新单位转换代码

---
 screen-common/src/main/java/com/moral/util/DateUtils.java |  200 +++++++++++++++++++++++++++++++++----------------
 1 files changed, 134 insertions(+), 66 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 add1279..8889611 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -92,18 +92,18 @@
 
 
     /**
-    * @Description: ���������������������������������
-            * @Param: [date]
-            * @return: java.util.Date
-            * @Author: ���������
-            * @Date: 2021/9/26
-            */
-    public static Date getHourlyStartTime(Date date){
+     * @Description: ���������������������������������
+     * @Param: [date]
+     * @return: java.util.Date
+     * @Author: ���������
+     * @Date: 2021/9/26
+     */
+    public static Date getHourlyStartTime(Date date) {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
-        cal.set(Calendar.MINUTE,0);
-        cal.set(Calendar.SECOND,0);
-        cal.set(Calendar.MILLISECOND,0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
         return cal.getTime();
     }
 
@@ -114,12 +114,12 @@
      * @Author: ���������
      * @Date: 2021/9/26
      */
-    public static Date getHourlyEndTime(Date date){
+    public static Date getHourlyEndTime(Date date) {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
-        cal.set(Calendar.MINUTE,59);
-        cal.set(Calendar.SECOND,59);
-        cal.set(Calendar.MILLISECOND,0);
+        cal.set(Calendar.MINUTE, 59);
+        cal.set(Calendar.SECOND, 59);
+        cal.set(Calendar.MILLISECOND, 0);
         return cal.getTime();
     }
 
@@ -137,13 +137,13 @@
         return startDate;
     }
 
-    /** 
-    * @Description: ���������������������������������������
-            * @Param: [date]
-            * @return: java.util.Date
-            * @Author: ���������
-            * @Date: 2021/9/26
-            */ 
+    /**
+     * @Description: ���������������������������������������
+     * @Param: [date]
+     * @return: java.util.Date
+     * @Author: ���������
+     * @Date: 2021/9/26
+     */
     public static Date getDailyEndTime(Date date) {
         String dateStr = dateToDateString(date, "yyyy-MM-dd");
         String endDateStr = dateStr + " 23:59:59";
@@ -153,62 +153,62 @@
 
 
     /**
-    * @Description: ���������������������������������������������������
-            * @Param: [date]
-            * @return: java.util.Date
-            * @Author: ���������
-            * @Date: 2021/9/26
-            */
-    public static Date getWeeklyStartTime(Date date){
+     * @Description: ���������������������������������������������������
+     * @Param: [date]
+     * @return: java.util.Date
+     * @Author: ���������
+     * @Date: 2021/9/26
+     */
+    public static Date getWeeklyStartTime(Date date) {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
-        if (1 ==  cal.get(Calendar.DAY_OF_WEEK)) {
+        if (1 == cal.get(Calendar.DAY_OF_WEEK)) {
             cal.add(Calendar.DAY_OF_MONTH, -1);
         }
-        cal.set(Calendar.DAY_OF_WEEK,Calendar.MONDAY);
-        cal.set(Calendar.HOUR_OF_DAY,0);
-        cal.set(Calendar.MINUTE,0);
-        cal.set(Calendar.SECOND,0);
-        cal.set(Calendar.MILLISECOND,0);
+        cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
         return cal.getTime();
     }
 
     /**
-    * @Description: ���������������������������������������������������������
-            * @Param: [date]
-            * @return: java.util.Date
-            * @Author: ���������
-            * @Date: 2021/9/26
-            */
-    public static Date getWeeklyEndTime(Date date){
+     * @Description: ���������������������������������������������������������
+     * @Param: [date]
+     * @return: java.util.Date
+     * @Author: ���������
+     * @Date: 2021/9/26
+     */
+    public static Date getWeeklyEndTime(Date date) {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
-        if (1 !=  cal.get(Calendar.DAY_OF_WEEK)) {
+        if (1 != cal.get(Calendar.DAY_OF_WEEK)) {
             cal.add(Calendar.DAY_OF_MONTH, 7);
         }
-        cal.set(Calendar.DAY_OF_WEEK,Calendar.SUNDAY);
-        cal.set(Calendar.HOUR_OF_DAY,23);
-        cal.set(Calendar.MINUTE,59);
-        cal.set(Calendar.SECOND,59);
-        cal.set(Calendar.MILLISECOND,0);
+        cal.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
+        cal.set(Calendar.HOUR_OF_DAY, 23);
+        cal.set(Calendar.MINUTE, 59);
+        cal.set(Calendar.SECOND, 59);
+        cal.set(Calendar.MILLISECOND, 0);
         return cal.getTime();
     }
 
     /**
-    * @Description: ���������������������������������������������������
-            * @Param: [date]
-            * @return: java.util.Date
-            * @Author: ���������
-            * @Date: 2021/9/26
-            */
-    public static Date getMonthlyStartTime(Date date){
+     * @Description: ���������������������������������������������������
+     * @Param: [date]
+     * @return: java.util.Date
+     * @Author: ���������
+     * @Date: 2021/9/26
+     */
+    public static Date getMonthlyStartTime(Date date) {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
-        cal.set(Calendar.DAY_OF_MONTH,cal.getActualMinimum(Calendar.DAY_OF_MONTH));
-        cal.set(Calendar.HOUR_OF_DAY,0);
-        cal.set(Calendar.MINUTE,0);
-        cal.set(Calendar.SECOND,0);
-        cal.set(Calendar.MILLISECOND,0);
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
         return cal.getTime();
     }
 
@@ -219,18 +219,18 @@
      * @Author: ���������
      * @Date: 2021/9/26
      */
-    public static Date getMonthlyEndTime(Date date){
+    public static Date getMonthlyEndTime(Date date) {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
-        cal.set(Calendar.DAY_OF_MONTH,cal.getActualMaximum(Calendar.DAY_OF_MONTH));
-        cal.set(Calendar.HOUR_OF_DAY,23);
-        cal.set(Calendar.MINUTE,59);
-        cal.set(Calendar.SECOND,59);
-        cal.set(Calendar.MILLISECOND,0);
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+        cal.set(Calendar.HOUR_OF_DAY, 23);
+        cal.set(Calendar.MINUTE, 59);
+        cal.set(Calendar.SECOND, 59);
+        cal.set(Calendar.MILLISECOND, 0);
         return cal.getTime();
     }
 
-    
+
     /**
      * @Description: Date���toString������������Date
      * @Param: []
@@ -939,6 +939,55 @@
         return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
     }
 
+    /*
+     * ������������������������
+     * */
+    public static Date getFirstDayOfCurrYear() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_YEAR, 1);
+        return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
+    }
+
+    /*
+     * ������������������������������
+     * */
+    public static Date getFirstDayOfYear(Date date) {
+        final Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        final int last = cal.getActualMinimum(Calendar.DAY_OF_YEAR);
+        cal.set(Calendar.DAY_OF_YEAR, last);
+        cal.set(Calendar.HOUR_OF_DAY,0);
+        cal.set(Calendar.MINUTE,0);
+        cal.set(Calendar.SECOND,0);
+        return cal.getTime();
+    }
+
+    /*
+     * ���������������������������������
+     * */
+    public static Date getLastDayOfYear(Date date) {
+        final Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        final int last = cal.getActualMaximum(Calendar.DAY_OF_YEAR);
+        cal.set(Calendar.DAY_OF_YEAR, last);
+        cal.set(Calendar.HOUR_OF_DAY, 23);
+        cal.set(Calendar.MINUTE, 59);
+        cal.set(Calendar.SECOND, 59);
+        return cal.getTime();
+    }
+
+    /*
+     * ���������������������������
+     * */
+    public static boolean isCurrentYear(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        int currentYear = cal.get(Calendar.YEAR);
+        cal.setTime(date);
+        int year = cal.get(Calendar.YEAR);
+        return year == currentYear;
+    }
+
     /**
      * ������������������������������
      *
@@ -1030,6 +1079,18 @@
         return df.format(calendar.getTime());
     }
 
+    /*
+     * ������������Date
+     * */
+    public static Date getYesterdayDate() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.add(Calendar.DAY_OF_MONTH, -1);
+        return cal.getTime();
+    }
 
     /**
      * 10���������������������
@@ -1116,6 +1177,7 @@
         todayStart.set(Calendar.MILLISECOND, 0);
         return todayStart.getTime().getTime();
     }
+
 
     public static Integer getTodayInt() {
         return (int) (getTodayTime() / 1000);
@@ -1743,4 +1805,10 @@
         calendar.add(Calendar.HOUR_OF_DAY, hours);
         return calendar.getTime();
     }
+
+    //������������Date
+    public static Date getFirstDayOfLastYear() {
+        String lastYear = getDateAddYear(DateUtils.dateToDateString(getDate(), DateUtils.yyyy), -1);
+        return DateUtils.getDate(lastYear, DateUtils.yyyy);
+    }
 }

--
Gitblit v1.8.0