From f62ce761a5c2dd1f281acbf72a66fd752af3d75d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 23 Jul 2021 14:19:51 +0800
Subject: [PATCH] 设备状态判断更新
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 1d777ef..8e61079 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -16,6 +16,10 @@
public class DateUtils {
/**
+ * ������������(yyyy)
+ */
+ public static final String yyyy = "yyyy";
+ /**
* ������������(yyyy-MM-dd)
*/
public static final String yyyy_MM_dd_EN = "yyyy-MM-dd";
@@ -746,8 +750,8 @@
* @param days
* @return
*/
- public static String getDateAddDay(String date, int days, String format) {
- DateFormat df = getDateFormat(format);
+ public static String getDateAddDay(String date, int days) {
+ DateFormat df = getDateFormat(yyyy_MM_dd_EN);
try {
Calendar cal = Calendar.getInstance();
cal.setTime(df.parse(date));
@@ -791,7 +795,7 @@
* @return
*/
public static String getDateAddMonth(String date, int m) {
- DateFormat df = getDateFormat(yyyyMM_EN);
+ DateFormat df = getDateFormat(yyyy_MM_EN);
try {
Calendar cal = Calendar.getInstance();
cal.setTime(df.parse(date));
@@ -1337,7 +1341,18 @@
return getDate(dateToDateString(calendar.getTime(), yyyy_MM_dd_EN));
}
- public static void main(String[] args) {
- System.out.println(getFirstDayOfCurrMonth());
+
+ /*���������������������*/
+ public static String getDateAddYear(String date, int year) {
+ DateFormat df = getDateFormat(yyyy);
+ try {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(df.parse(date));
+ cal.add(Calendar.YEAR, year);
+ date = df.format(cal.getTime());
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ return date;
}
}
--
Gitblit v1.8.0