From dfe65c30a3fa372af98e8341ea46b1c4bf7cc725 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 11:35:55 +0800
Subject: [PATCH] 增补属性的json中的顺序

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java |   87 +++++++++++++++++++++++++------------------
 1 files changed, 50 insertions(+), 37 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 8e97a16..76f4ac2 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
@@ -423,7 +423,7 @@
 				case "鍛ㄥ洓" -> 4;
 				case "鍛ㄤ簲" -> 5;
 				case "鍛ㄥ叚" -> 6;
-				case "鍛ㄤ竷" -> 7;
+				case "鍛ㄤ竷" -> 0;//鏍规嵁鍗忚瑕佹眰鏄熸湡澶╀负0
 				default -> 0;
 			};
 		}else{
@@ -434,7 +434,7 @@
 				case "Thu" -> 4;
 				case "Fri" -> 5;
 				case "Sat" -> 6;
-				case "Sun" -> 7;
+				case "Sun" -> 0;//鏍规嵁鍗忚瑕佹眰鏄熸湡澶╀负0
 				default -> 0;
 			};
 		}
@@ -499,6 +499,17 @@
 	}
 
 	//////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * 瀛楃涓插瀷鏃ユ湡(2024-12)杞垚骞存湀鏃ユ暟缁�
+	 * @param yyyy_MM 骞存湀鏃�
+	 * @return 骞存湀鏃ユ暟缁�
+	 */
+	public static int[] yyyy_MM_ymdGroup(String yyyy_MM){
+		int y = Integer.parseInt(yyyy_MM.substring(0 , 4)) ;
+		int m = Integer.parseInt(yyyy_MM.substring(5 , 7)) ;
+		return new int[]{y,m} ;
+	}
 
 	/**
 	 * 瀛楃涓插瀷鏃ユ湡(2009-09-10)杞垚骞存湀鏃ユ暟缁�
@@ -603,7 +614,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() ;
 	}
@@ -619,7 +630,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) ;
 	}
@@ -633,7 +644,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) ;
 	}
@@ -647,7 +658,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) ;
 	}
@@ -661,7 +672,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) ;
 	}
@@ -675,7 +686,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) ;
 	}
@@ -689,7 +700,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) ;
 	}
@@ -703,7 +714,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) ;
 	}
@@ -715,7 +726,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) ;
 	}
@@ -727,7 +738,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) ;
 	}
@@ -739,7 +750,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) ;
 	}
@@ -751,7 +762,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) ;
 	}
@@ -763,7 +774,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) ;
 	}
@@ -779,7 +790,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) ;
 	}
@@ -795,7 +806,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) ;
 	}
@@ -809,7 +820,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) ;
 	}	
@@ -823,7 +834,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) ;
 	}
@@ -837,7 +848,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) ;
 	}
@@ -851,7 +862,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) ;
 	}	/**
@@ -864,7 +875,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) ;
 	}
@@ -878,7 +889,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) ;
 	}
@@ -890,7 +901,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) ;
 	}
@@ -902,7 +913,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) ;
 	}
@@ -916,7 +927,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) ;
 	}
@@ -928,7 +939,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) ;
 	}
@@ -940,7 +951,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) ;
 	}
@@ -959,7 +970,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) ;
 	}
@@ -973,7 +984,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) ;
 	}
@@ -985,7 +996,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) ;
 	}
@@ -997,7 +1008,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) ;
 	}
@@ -1009,7 +1020,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) ;
 	}
@@ -1028,7 +1039,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) ;
 	}
@@ -1042,7 +1053,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) ;
 	}
@@ -1054,7 +1065,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) ;
 	}
@@ -1066,7 +1077,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) ;
 	}
@@ -1640,6 +1651,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