From 68a49e074e779e1960f827ff02d69d3b73fa9165 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 15 Jul 2021 09:13:11 +0800
Subject: [PATCH] web端小时aqi，因子月均值
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 1542852..1d777ef 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -761,6 +761,17 @@
}
/**
+ * ������������������������
+ *
+ * @return
+ */
+ public static Date getFirstDayOfCurrMonth() {
+ Calendar cal = Calendar.getInstance();
+ cal.set(Calendar.DAY_OF_MONTH, 1);
+ return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
+ }
+
+ /**
* ������������������������������
*
* @return
@@ -769,8 +780,7 @@
Calendar cal = Calendar.getInstance();
cal.add(Calendar.MONTH, 1);
cal.set(Calendar.DAY_OF_MONTH, 0);
-
- return cal.getTime();
+ return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
}
/**
@@ -1312,10 +1322,22 @@
}
//���������������
- public static Date geLastWeekMonday() {
+ public static Date getLastWeekMonday() {
Calendar cal = Calendar.getInstance();
- cal.setTime(getDate(getMondayOfThisWeek(),yyyy_MM_dd_EN) );
+ cal.setTime(getDate(getMondayOfThisWeek(), yyyy_MM_dd_EN));
cal.add(Calendar.DATE, -7);
return cal.getTime();
}
+
+ //���������������������
+ public static Date getFirstDayOfLastMonth() {
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.MONTH, -1);
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ return getDate(dateToDateString(calendar.getTime(), yyyy_MM_dd_EN));
+ }
+
+ public static void main(String[] args) {
+ System.out.println(getFirstDayOfCurrMonth());
+ }
}
--
Gitblit v1.8.0