From f844554d994465a14e93b0334c2677a37876d7eb Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 24 七月 2024 14:08:18 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java | 116 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 64 insertions(+), 52 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
index 1e04eeb..c5c1bc4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
@@ -385,7 +385,10 @@
public static Date dateFrom_yyyy_MM_dd(String yyyy_MM_dd) throws Exception {
return new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).parse(yyyy_MM_dd);
}
-
+ public static Date dateFrom_yyyy_MM_dd1(String yyyy_MM_dd_HH_mm_ss) throws Exception {
+ return new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).parse(yyyy_MM_dd_HH_mm_ss);
+ }
+
public static Date dateFrom_yyyyMMddHHmmss(String yyyyMMddHHmmss) throws Exception {
return new SimpleDateFormat("yyyyMMddHHmmss", Locale.CHINA).parse(yyyyMMddHHmmss);
}
@@ -412,16 +415,29 @@
}
public static Integer week_Int(){
String str = week_Str() ;
- return switch (str) {
- case "Mon" -> 1;
- case "Tue" -> 2;
- case "Wed" -> 3;
- case "Thu" -> 4;
- case "Fri" -> 5;
- case "Sat" -> 6;
- case "Sun" -> 7;
- default -> 0;
- };
+ if(str.startsWith("鍛�")){
+ return switch (str) {
+ case "鍛ㄤ竴" -> 1;
+ case "鍛ㄤ簩" -> 2;
+ case "鍛ㄤ笁" -> 3;
+ case "鍛ㄥ洓" -> 4;
+ case "鍛ㄤ簲" -> 5;
+ case "鍛ㄥ叚" -> 6;
+ case "鍛ㄤ竷" -> 7;
+ default -> 0;
+ };
+ }else{
+ return switch (str) {
+ case "Mon" -> 1;
+ case "Tue" -> 2;
+ case "Wed" -> 3;
+ case "Thu" -> 4;
+ case "Fri" -> 5;
+ case "Sat" -> 6;
+ case "Sun" -> 7;
+ default -> 0;
+ };
+ }
}
/**
* 涓や釜鏃ユ湡闂寸浉宸閽熸暟
@@ -587,7 +603,7 @@
*/
public static Long lastXMinuteTime(int xMin) {
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.MINUTE, -xMin);
+ cal.add(Calendar.MINUTE, xMin<=0?xMin:-xMin);
Date date = cal.getTime() ;
return date.getTime() ;
}
@@ -603,7 +619,7 @@
Date d = new SimpleDateFormat("yyyy-MM-dd HH", Locale.CHINA).parse(yyyy_MM_dd_HH);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.HOUR_OF_DAY, -xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?xhour:-xhour);
Date date = cal.getTime() ;
return DateTime.yyyy_MM_dd_HH(date) ;
}
@@ -617,7 +633,7 @@
Date d = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.CHINA).parse(yyyy_MM_dd_HH_mm);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.HOUR_OF_DAY, -xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?xhour:-xhour);
Date date = cal.getTime() ;
return DateTime.yyyy_MM_dd_HH_mm(date) ;
}
@@ -631,7 +647,7 @@
Date d = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA).parse(yyyy_MM_dd_HH_mm_ss);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.HOUR_OF_DAY, -xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?xhour:-xhour);
Date date = cal.getTime() ;
return DateTime.yyyy_MM_dd_HH_mm_ss(date) ;
}
@@ -645,7 +661,7 @@
Date d = new SimpleDateFormat("yyyyMMddHH", Locale.CHINA).parse(yyyyMMddHH);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.HOUR_OF_DAY, -xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?xhour:-xhour);
Date date = cal.getTime() ;
return DateTime.yyyyMMddHH(date) ;
}
@@ -659,7 +675,7 @@
Date d = new SimpleDateFormat("yyyyMMddHHmm", Locale.CHINA).parse(yyyyMMddHHmm);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.HOUR_OF_DAY, -xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?xhour:-xhour);
Date date = cal.getTime() ;
return DateTime.yyyyMMddHHmm(date) ;
}
@@ -673,7 +689,7 @@
Date d = new SimpleDateFormat("yyyyMMddHHmmss", Locale.CHINA).parse(yyyyMMddHHmmss);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.HOUR_OF_DAY, -xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?xhour:-xhour);
Date date = cal.getTime() ;
return DateTime.yyyyMMddHHmmss(date) ;
}
@@ -687,7 +703,7 @@
public static String lastXHour_yyyy_MM_dd_HH(int xhour){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.HOUR_OF_DAY, -xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?xhour:-xhour);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyy_MM_dd_HH(date) ;
}
@@ -699,7 +715,7 @@
public static String lastXHour_yyyy_MM_dd_HH_mm(int xhour){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.HOUR_OF_DAY, -xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?xhour:-xhour);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyy_MM_dd_HH_mm(date) ;
}
@@ -711,7 +727,7 @@
public static String lastXHour_yyyy_MM_dd_HH_mm_ss(int xhour){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.HOUR_OF_DAY, -xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?xhour:-xhour);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyy_MM_dd_HH_mm_ss(date) ;
}
@@ -723,7 +739,7 @@
public static String lastXHour_yyyyMMddHH(int xhour){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.HOUR_OF_DAY, -xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?xhour:-xhour);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyyMMddHH(date) ;
}
@@ -735,7 +751,7 @@
public static String lastXHour_yyyyMMddHHmm(int xhour){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.HOUR_OF_DAY, -xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?xhour:-xhour);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyyMMddHHmm(date) ;
}
@@ -747,7 +763,7 @@
public static String lastXHour_yyyyMMddHHmmss(int xhour){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.HOUR_OF_DAY, -xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?xhour:-xhour);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyyMMddHHmmss(date) ;
}
@@ -763,7 +779,7 @@
Date d = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA).parse(yyyy_MM_dd_HH_mm_ss);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.MINUTE, xminute);
+ cal.add(Calendar.MINUTE, xminute<=0?-xminute:xminute );
Date date = cal.getTime() ;
return DateTime.yyyy_MM_dd_HH_mm_ss(date) ;
}
@@ -779,7 +795,7 @@
Date d = new SimpleDateFormat("yyyy-MM-dd HH", Locale.CHINA).parse(yyyy_MM_dd_HH);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.HOUR_OF_DAY, xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?-xhour:xhour );
Date date = cal.getTime() ;
return DateTime.yyyy_MM_dd_HH(date) ;
}
@@ -793,7 +809,7 @@
Date d = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.CHINA).parse(yyyy_MM_dd_HH_mm);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.HOUR_OF_DAY, xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?-xhour:xhour);
Date date = cal.getTime() ;
return DateTime.yyyy_MM_dd_HH_mm(date) ;
}
@@ -807,7 +823,7 @@
Date d = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA).parse(yyyy_MM_dd_HH_mm_ss);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.HOUR_OF_DAY, xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?-xhour:xhour);
Date date = cal.getTime() ;
return DateTime.yyyy_MM_dd_HH_mm_ss(date) ;
}
@@ -821,7 +837,7 @@
Date d = new SimpleDateFormat("yyyyMMddHH", Locale.CHINA).parse(yyyyMMddHH);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.HOUR_OF_DAY, xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?-xhour:xhour);
Date date = cal.getTime() ;
return DateTime.yyyyMMddHH(date) ;
}
@@ -835,7 +851,7 @@
Date d = new SimpleDateFormat("yyyyMMddHHmm", Locale.CHINA).parse(yyyyMMddHHmm);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.HOUR_OF_DAY, xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?-xhour:xhour);
Date date = cal.getTime() ;
return DateTime.yyyyMMddHHmm(date) ;
} /**
@@ -848,7 +864,7 @@
Date d = new SimpleDateFormat("yyyyMMddHHmmss", Locale.CHINA).parse(yyyyMMddHHmmss);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.HOUR_OF_DAY, xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?-xhour:xhour);
Date date = cal.getTime() ;
return DateTime.yyyyMMddHHmmss(date) ;
}
@@ -862,7 +878,7 @@
public static String nextXHour_yyyy_MM_dd_HH(int xhour){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.HOUR_OF_DAY, xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?-xhour:xhour);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyy_MM_dd_HH(date) ;
}
@@ -874,7 +890,7 @@
public static String nextXHour_yyyy_MM_dd_HH_mm(int xhour){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.HOUR_OF_DAY, xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?-xhour:xhour);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyy_MM_dd_HH_mm(date) ;
}
@@ -886,7 +902,7 @@
public static String nextXHour_yyyy_MM_dd_HH_mm_ss(int xhour){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.HOUR_OF_DAY, xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?-xhour:xhour);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyy_MM_dd_HH_mm_ss(date) ;
}
@@ -900,7 +916,7 @@
public static String nextXHour_yyyyMMddHH(int xhour){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.HOUR_OF_DAY, xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?-xhour:xhour);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyyMMddHH(date) ;
}
@@ -912,7 +928,7 @@
public static String nextXHour_yyyyMMddHHmm(int xhour){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.HOUR_OF_DAY, xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?-xhour:xhour);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyyMMddHHmm(date) ;
}
@@ -924,7 +940,7 @@
public static String nextXHour_yyyyMMddHHmmss(int xhour){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.HOUR_OF_DAY, xhour);
+ cal.add(Calendar.HOUR_OF_DAY, xhour<=0?-xhour:xhour);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyyMMddHHmmss(date) ;
}
@@ -943,7 +959,7 @@
Date d = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).parse(yyyy_MM_dd);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.DAY_OF_YEAR, -xday);
+ cal.add(Calendar.DAY_OF_YEAR, xday<=0?xday:-xday);
Date date = cal.getTime() ;
return DateTime.yyyy_MM_dd(date) ;
}
@@ -957,7 +973,7 @@
Date d = new SimpleDateFormat("yyyyMMdd", Locale.CHINA).parse(yyyyMMdd);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.DAY_OF_YEAR, -xday);
+ cal.add(Calendar.DAY_OF_YEAR, xday<=0?xday:-xday);
Date date = cal.getTime() ;
return DateTime.yyyyMMdd(date) ;
}
@@ -969,7 +985,7 @@
public static String lastXDay_yyyy_MM_dd(int xday){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.DAY_OF_YEAR, -xday);
+ cal.add(Calendar.DAY_OF_YEAR, xday<=0?xday:-xday);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyy_MM_dd(date) ;
}
@@ -981,7 +997,7 @@
public static String lastXDay_yyyy_MM_dd_HH_ss(int xday){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.DAY_OF_YEAR, -xday);
+ cal.add(Calendar.DAY_OF_YEAR, xday<=0?xday:-xday);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyy_MM_dd_HH_mm_ss(date) ;
}
@@ -993,7 +1009,7 @@
public static String lastXDay_yyyyMMdd(int xday){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.DAY_OF_YEAR, -xday);
+ cal.add(Calendar.DAY_OF_YEAR, xday<=0?xday:-xday);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyyMMdd(date) ;
}
@@ -1012,7 +1028,7 @@
Date d = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).parse(yyyy_MM_dd);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.DAY_OF_YEAR, xday);
+ cal.add(Calendar.DAY_OF_YEAR, xday<=0?-xday:xday);
Date date = cal.getTime() ;
return DateTime.yyyy_MM_dd(date) ;
}
@@ -1026,7 +1042,7 @@
Date d = new SimpleDateFormat("yyyyMMdd", Locale.CHINA).parse(yyyyMMdd);
Calendar cal = Calendar.getInstance();
cal.setTime(d);
- cal.add(Calendar.DAY_OF_YEAR, xday);
+ cal.add(Calendar.DAY_OF_YEAR, xday<=0?-xday:xday);
Date date = cal.getTime() ;
return DateTime.yyyyMMdd(date) ;
}
@@ -1038,7 +1054,7 @@
public static String nextXDay_yyyy_MM_dd(int xday){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.DAY_OF_YEAR, xday);
+ cal.add(Calendar.DAY_OF_YEAR, xday<=0?-xday:xday);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyy_MM_dd(date) ;
}
@@ -1050,7 +1066,7 @@
public static String nextXDay_yyyyMMdd(int xday){
Date date = new Date();
Calendar cal = Calendar.getInstance();
- cal.add(Calendar.DAY_OF_YEAR, xday);
+ cal.add(Calendar.DAY_OF_YEAR, xday<=0?-xday:xday);
date.setTime(cal.getTimeInMillis());
return DateTime.yyyyMMdd(date) ;
}
@@ -1565,13 +1581,7 @@
String[] s = new String[3] ;
s[0] = ymd.substring(0 , 4) ;
s[1] = ymd.substring(5 , 7) ;
- if(s[1].charAt(0) == '0'){
- s[1] = s[1].substring(1) ;
- }
s[2] = ymd.substring(8,10) ;
- if(s[2].charAt(0) == '0'){
- s[2] = s[2].substring(1) ;
- }
return s ;
}
/**
@@ -1630,6 +1640,8 @@
Date dt = getDate(1447857387L) ;
String s = yyyy_MM_dd_HH_mm_ss(dt);
System.out.println(s);
+
+ System.out.println(lastMonth_ym()) ;
}
--
Gitblit v1.8.0