From 2ad979f912a1883c7a46048fa371d213f8406ba9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 08 Nov 2021 11:26:22 +0800
Subject: [PATCH] update
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 139 ++++++++++++++++++++++++----------------------
1 files changed, 73 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 3c1c89e..fd9ffc8 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: []
@@ -1744,4 +1744,11 @@
calendar.add(Calendar.HOUR_OF_DAY, hours);
return calendar.getTime();
}
+
+ //������������Date
+ public static Date getFirstDayOfLastYear() {
+ String lastYear = getDateAddYear(DateUtils.dateToDateString(getDate(), DateUtils.yyyy), -1);
+ System.out.println(DateUtils.getDate(lastYear, DateUtils.yyyy));
+ return DateUtils.getDate(lastYear, DateUtils.yyyy);
+ }
}
--
Gitblit v1.8.0