From 257da880e75699c3dbdd1a25c9430df7d1cdee38 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 14 Jul 2021 11:59:39 +0800
Subject: [PATCH] screen-manage websocket处理完成增加时间戳
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 495e929..5fde952 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -1310,4 +1310,20 @@
throw new RuntimeException(e);
}
}
+
+ //���������������
+ 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