From 3dbe2c21c05072cdab5a7f75a0bd154bd9207552 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 14 Jul 2021 13:09:12 +0800
Subject: [PATCH] screen-manage 实时数据message，添加time，datatime，time1等测试数据
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 f5ecd8a..5fde952 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -1301,12 +1301,6 @@
return date;
}
- //������������������������������������
- public static Date convertDate(Date date) {
- String dateString = dateToDateString(date, yyyy_MM_dd_HH_mm_EN);
- return getDate(dateString, yyyy_MM_dd_HH_mm_EN);
- }
-
//���������������������������������
public static Date dataToTimeStampTime(Date time, String dateFormat) {
String dateString = dateToDateString(time, dateFormat);
@@ -1317,7 +1311,19 @@
}
}
- public static void main(String[] args) throws InterruptedException {
- System.out.println(new Date().getTime());
+ //���������������
+ 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