From 39e3cd4fb4800dba43b3e09a79d0b6b424c5afa4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 16 十一月 2022 14:13:41 +0800
Subject: [PATCH] 优化 巡检 清空统计页面
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 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 fbf56b8..f1fb493 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
@@ -33,6 +33,7 @@
public static final String DATE_FORMATE_STRING_K = "yyyyMMddHHmmssSSS";
public static final String DATE_FORMATE_STRING_L = "MMdd";
public static final String DATE_FORMATE_STRING_M = "yyyyMM";
+ public static final String DATE_FORMATE_STRING_N = "HHmmss";
static {
formats.put("yyyyMMddHHmmss", new SimpleDateFormat("yyyyMMddHHmmss"));
@@ -49,6 +50,7 @@
formats.put("yyyyMMddHHmmssSSS", new SimpleDateFormat("yyyyMMddHHmmssSSS"));
formats.put("MMdd", new SimpleDateFormat("MMdd"));
formats.put("yyyyMM", new SimpleDateFormat("yyyyMM"));
+ formats.put("HHmmss", new SimpleDateFormat("HHmmss"));
}
@@ -139,24 +141,24 @@
}
}
- public static Date getDateFromStringB(String date){
+ public static Date getDateFromStringB(String date) {
SimpleDateFormat sDateFormat = getDateFormat(DateUtil.DATE_FORMATE_STRING_B);
- try{
+ try {
synchronized (sDateFormat) {
return sDateFormat.parse(date);
}
- }catch (Exception e){
+ } catch (Exception e) {
throw new IllegalArgumentException(e);
}
}
- public static Date getDateFromStringA(String date){
+ public static Date getDateFromStringA(String date) {
SimpleDateFormat sDateFormat = getDateFormat(DateUtil.DATE_FORMATE_STRING_A);
- try{
+ try {
synchronized (sDateFormat) {
return sDateFormat.parse(date);
}
- }catch (Exception e){
+ } catch (Exception e) {
throw new IllegalArgumentException(e);
}
}
@@ -173,7 +175,6 @@
public static String getNow(String pattern) {
return getFormatTimeString(new Date(), pattern);
}
-
public static String getLastTime() {
@@ -446,10 +447,10 @@
// c.setTime(DateUtil.getDateFromString("2021-12-03",DateUtil.DATE_FORMATE_STRING_A));
// c.add(Calendar.DAY_OF_MONTH, 125);
// System.out.println("澧炲姞涓�澶╁悗鏃ユ湡:"+sf.format(c.getTime()));
- System.out.println( "2021-12-07".compareTo(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B)));
+ System.out.println("2021-12-07".compareTo(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B)));
}
- public static String getAddDayString(Date date,String pattern,int days) {
+ public static String getAddDayString(Date date, String pattern, int days) {
SimpleDateFormat sf = new SimpleDateFormat(pattern);
Calendar c = Calendar.getInstance();
c.setTime(date);
@@ -457,11 +458,28 @@
return sf.format(c.getTime());
}
- public static String getAddDayStringB(Date date,int days) {
+ public static String getAddDayStringB(Date date, int days) {
SimpleDateFormat sf = new SimpleDateFormat(DATE_FORMATE_STRING_B);
Calendar c = Calendar.getInstance();
c.setTime(date);
c.add(Calendar.DAY_OF_MONTH, days);
+ return sf.format(c.getTime());
+ }
+
+ public static String getAddDayStringA(Date date, int days) {
+ SimpleDateFormat sf = new SimpleDateFormat(DATE_FORMATE_STRING_A);
+ Calendar c = Calendar.getInstance();
+ c.setTime(date);
+ c.add(Calendar.DAY_OF_MONTH, days);
+ return sf.format(c.getTime());
+ }
+
+
+ public static String getAddMonthStringA(Date date, int month) {
+ SimpleDateFormat sf = new SimpleDateFormat(DATE_FORMATE_STRING_A);
+ Calendar c = Calendar.getInstance();
+ c.setTime(date);
+ c.add(Calendar.MONTH, month);
return sf.format(c.getTime());
}
@@ -570,4 +588,25 @@
private static int millisecondsToDays(long intervalMs) {
return (int) (intervalMs / (1000 * 86400));
}
+
+ /**
+ * 銆�銆� *瀛楃涓茬殑鏃ユ湡鏍煎紡鐨勮绠�
+ *
+ */
+ public static int daysBetween(String smdate, String bdate) {
+ long between_days = 0;
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(sdf.parse(smdate));
+ long time1 = cal.getTimeInMillis();
+ cal.setTime(sdf.parse(bdate));
+ long time2 = cal.getTimeInMillis();
+ between_days = (time2 - time1) / (1000 * 3600 * 24);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return Integer.parseInt(String.valueOf(between_days));
+ }
}
--
Gitblit v1.8.0