From 65f504c971b3ba63529ea5dd4e9123d5d5388812 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 21 八月 2024 17:10:41 +0800
Subject: [PATCH] 优化采购提示消息不准确问题
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 66 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 13 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
index 17b13e5..a152ff6 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -14,7 +14,7 @@
private static DateFormat dateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
- public static final String LAST_TIME = "2038-01-01 00:00:00";
+ public static final String LAST_TIME = "2050-01-01 00:00:00";
private static Map<String, SimpleDateFormat> formats = new HashMap();
public static final String DATE_FORMATE_STRING_DEFAULT = "yyyyMMddHHmmss";
@@ -412,10 +412,10 @@
public static Date getNextMonthFirstDate(Date curDate) {
- return getNextMonthFirstDate(curDate,1);
+ return getNextMonthFirstDate(curDate, 1);
}
- public static Date getNextMonthFirstDate(Date curDate,int monthCount) {
+ public static Date getNextMonthFirstDate(Date curDate, int monthCount) {
Calendar curDateCal = Calendar.getInstance();
curDateCal.setTime(curDate);
@@ -817,6 +817,22 @@
return calendar.getTime();
}
+ /**
+ * 闄ゅ幓 灏忔椂 鍒� 绉�
+ *
+ * deadtime 鏈潵灏卞皯浜嗕竴绉�
+ *
+ * @param time
+ * @return
+ */
+ public static Date deadTimeToDate(Date time) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(time);
+ calendar.add(Calendar.SECOND,1);
+ setTimeToMidnight(calendar);
+ return calendar.getTime();
+ }
+
public static boolean sameMonthDay(Date startDate, Date endDate) {
Calendar startCalendar = Calendar.getInstance();
startCalendar.setTime(startDate);
@@ -824,7 +840,7 @@
endCalender.setTime(endDate);
if (
startCalendar.get(Calendar.DAY_OF_MONTH) == endCalender.get(Calendar.DAY_OF_MONTH)
- && startCalendar.get(Calendar.HOUR_OF_DAY) == endCalender.get(Calendar.HOUR_OF_DAY)
+ && startCalendar.get(Calendar.HOUR_OF_DAY) == endCalender.get(Calendar.HOUR_OF_DAY)
) {
return true;
}
@@ -832,8 +848,8 @@
return false;
}
- public static double dayCompare(Date fromDate, Date toDate){
- return dayCompare(fromDate,toDate,false);
+ public static double dayCompare(Date fromDate, Date toDate) {
+ return dayCompare(fromDate, toDate, false);
}
/**
@@ -845,12 +861,12 @@
* @param toDate
* @return
*/
- public static double dayCompare(Date fromDate, Date toDate,boolean plusOneSec) {
+ public static double dayCompare(Date fromDate, Date toDate, boolean plusOneSec) {
- if(plusOneSec){
+ if (plusOneSec) {
Calendar toD = Calendar.getInstance();
toD.setTime(toDate);
- toD.add(Calendar.SECOND,1);
+ toD.add(Calendar.SECOND, 1);
toDate = toD.getTime();
}
@@ -866,8 +882,8 @@
Calendar fromDateCal = Calendar.getInstance();
fromDateCal.setTime(fromDate);
fromDateCal.set(Calendar.DAY_OF_MONTH, 1);
- fromDateCal.set(Calendar.HOUR_OF_DAY,0);
- fromDateCal.set(Calendar.MINUTE,0);
+ fromDateCal.set(Calendar.HOUR_OF_DAY, 0);
+ fromDateCal.set(Calendar.MINUTE, 0);
if (fromDate.getTime() > fromDateCal.getTime().getTime()) {
fromDateCal.add(Calendar.MONTH, 1);
firstDay = false;
@@ -878,8 +894,8 @@
Calendar toDateCal = Calendar.getInstance();
toDateCal.setTime(toDate);
toDateCal.set(Calendar.DAY_OF_MONTH, 1);
- toDateCal.set(Calendar.HOUR_OF_DAY,0);
- toDateCal.set(Calendar.MINUTE,0);
+ toDateCal.set(Calendar.HOUR_OF_DAY, 0);
+ toDateCal.set(Calendar.MINUTE, 0);
if (toDate.getTime() > toDateCal.getTime().getTime()) {
toDateFirstDate = toDateCal.getTime();
@@ -933,4 +949,28 @@
endDate.add(Calendar.HOUR_OF_DAY, hour.intValue());
return endDate.getTime();
}
+
+ public static String getNextSecTime(String time) {
+ Date tTime = getDateFromStringA(time);
+ return getNextSecTime(tTime);
+ }
+
+ public static String getNextSecTime(Date time) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(time);
+ calendar.add(Calendar.SECOND, 1);
+ return getFormatTimeStringA(calendar.getTime());
+ }
+
+ public static String getPreSecTime(String time) {
+ Date tTime = getDateFromStringA(time);
+ return getPreSecTime(tTime);
+ }
+
+ public static String getPreSecTime(Date time) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(time);
+ calendar.add(Calendar.SECOND, -1);
+ return getFormatTimeStringA(calendar.getTime());
+ }
}
--
Gitblit v1.8.0