From ebaaac167a229dd2d9115478e17bc46b7f7afb5f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 22 Dec 2021 17:09:39 +0800
Subject: [PATCH] 设备最大值，最小值，平均值小时统计任务
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 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 fd9ffc8..8889611 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -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���������������������
@@ -1748,7 +1809,6 @@
//������������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