From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 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 439c5d2..3699260 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -651,6 +651,8 @@
return new Date();
}
+
+
public static String getAfterNDays(Date date, int n, String formateStr) {
SimpleDateFormat sdf = new SimpleDateFormat(formateStr);
Calendar calendar = new GregorianCalendar();
@@ -956,9 +958,9 @@
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);
+ cal.set(Calendar.HOUR_OF_DAY, 0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
return cal.getTime();
}
@@ -977,16 +979,16 @@
}
/*
- * ���������������������������������
- * */
- public static Date getFirstDayOfMonth(Date date){
+ * ���������������������������������
+ * */
+ public static Date getFirstDayOfMonth(Date date) {
final Calendar cal = Calendar.getInstance();
cal.setTime(date);
final int last = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
cal.set(Calendar.DAY_OF_MONTH, last);
- cal.set(Calendar.HOUR_OF_DAY,0);
- cal.set(Calendar.MINUTE,0);
- cal.set(Calendar.SECOND,0);
+ cal.set(Calendar.HOUR_OF_DAY, 0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
return cal.getTime();
}
@@ -997,7 +999,7 @@
final Calendar cal = Calendar.getInstance();
cal.setTime(date);
final int last = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
- cal.set(Calendar.DAY_OF_YEAR, last);
+ cal.set(Calendar.DAY_OF_MONTH, last);
cal.set(Calendar.HOUR_OF_DAY, 23);
cal.set(Calendar.MINUTE, 59);
cal.set(Calendar.SECOND, 59);
@@ -1016,6 +1018,19 @@
int year = cal.get(Calendar.YEAR);
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;
+ }
+
/**
* ������������������������������
@@ -1431,6 +1446,7 @@
return calendar.getTime();
}
+
/**
* <p>
* Title: getDays
@@ -1796,4 +1812,22 @@
String lastYear = getDateAddYear(DateUtils.dateToDateString(getDate(), DateUtils.yyyy), -1);
return DateUtils.getDate(lastYear, DateUtils.yyyy);
}
+
+ //���������������������������������������������������
+ public static Map<Date, List<Integer>> getBeforeAndAfterHourDate(Date date) {
+ String s = dateToDateString(date, yyyy_MM_dd_EN);
+ List<String> timeLag = getTimeLag(s);
+ Map<Date, List<Integer>> result = new HashMap<>();
+ for (String s1 : timeLag) {
+ List<Integer> objects = new ArrayList<>();
+ Date current = getDate(s1, yyyy_MM_dd_HH_EN);
+ Date before = addHours(current, -1);
+ Date after = addHours(current, 1);
+ objects.add(getHour(before));
+ objects.add(getHour(current));
+ objects.add(getHour(after));
+ result.put(current, objects);
+ }
+ return result;
+ }
}
--
Gitblit v1.8.0