From f5765e4ff4ea188e8a6ba4d66f3c4e7fc2268fdd Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 02 Jul 2021 17:20:29 +0800
Subject: [PATCH] 定时任务update
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 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 cbc63a2..5fde952 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -67,6 +67,14 @@
* ������������(HH:mm:ss)
*/
public static final String HH_mm_ss_EN = "HH:mm:ss";
+ /*
+ * ������������(yyyy-MM-dd HH:mm)
+ * */
+ public static final String yyyy_MM_dd_HH_mm_EN = "yyyy-MM-dd HH:mm";
+ /*
+ * ������������(yyyy-MM-dd HH)
+ * */
+ public static final String yyyy_MM_dd_HH_EN = "yyyy-MM-dd HH";
/**
* DateFormat������
*/
@@ -443,14 +451,14 @@
}
/**
- * @Description: ������������������day���������������
- * @Param: [date, day]
- * @return: java.util.Date
- * @Author: ���������
- * @Date: 2021/3/30
- */
+ * @Description: ������������������day���������������
+ * @Param: [date, day]
+ * @return: java.util.Date
+ * @Author: ���������
+ * @Date: 2021/3/30
+ */
public static Date getDateOfDay(Date date, int day) {
- if(date==null)
+ if (date == null)
return null;
Calendar now = Calendar.getInstance(TimeZone.getDefault());
now.setTime(date);
@@ -1293,11 +1301,29 @@
return date;
}
+ //���������������������������������
+ public static Date dataToTimeStampTime(Date time, String dateFormat) {
+ String dateString = dateToDateString(time, dateFormat);
+ try {
+ return getDateFormat(dateFormat).parse(dateString);
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ }
- public static void main(String[] args) throws InterruptedException {
- Date date1 = new Date();
- Thread.sleep(1000);
- Date date2 = new Date();
- System.out.println(DateUtils.compareDateStr(date1, date2));
+ //���������������
+ public static Date getLastWeekMonday() {
+ Calendar cal = Calendar.getInstance();
+ 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));
}
}
--
Gitblit v1.8.0