From d19e91bcc4ed9ab08e8be375fb5fc0f7e874a6a9 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 30 四月 2025 18:17:44 +0800
Subject: [PATCH] 测试调整格式
---
src/main/java/com/whyc/util/DateUtil.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/util/DateUtil.java b/src/main/java/com/whyc/util/DateUtil.java
index 3259817..0372041 100644
--- a/src/main/java/com/whyc/util/DateUtil.java
+++ b/src/main/java/com/whyc/util/DateUtil.java
@@ -11,9 +11,12 @@
public class DateUtil {
public static SimpleDateFormat YYYY_MM_DD_HH_MM_SS=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ public static SimpleDateFormat YYYY_MM_DD_HH_MM=new SimpleDateFormat("yyyy-MM-dd HH:mm");
public static SimpleDateFormat YYYY_MM_DD_HH_MM_SS_UNION=new SimpleDateFormat("yyyyMMddHHmmss");
public static SimpleDateFormat YYYY_MM_DD=new SimpleDateFormat("yyyy-MM-dd");
public static SimpleDateFormat YYYY_MM=new SimpleDateFormat("yyyy-MM");
+ public static SimpleDateFormat YYYY_DOT_MM=new SimpleDateFormat("yyyy.MM");
+ public static SimpleDateFormat YYYY_DOT_MM_DOT_DD=new SimpleDateFormat("yyyy.MM.dd");
public static SimpleDateFormat YYYY_MM_TABLE=new SimpleDateFormat("yyyy_MM");
public static int compare(String date1Str,String date2Str) throws ParseException {
@@ -664,6 +667,45 @@
return yearTimeDescMap;
}
+ /**
+ * 鎸夋湀鍒掑垎涓�,涓嶅瓨鍦ㄩ粯璁よ〃,閮芥槸鍒嗚〃
+ * @param startTimeDate
+ * @param endTimeDate
+ * @return
+ * @throws ParseException
+ */
+ public static Map<String,List<Date>> getQueryTimeForSubTablesByMonthDesc2(Date startTimeDate,Date endTimeDate) throws ParseException {
+ //鏍规嵁绛涢�夌殑鏃堕棿娈�,鏌ヨ鍑虹鍚堣姹傜殑鍚勫垎琛ㄨ褰曟暟
+ //棣栧厛,濡傛灉褰撳墠鏃堕棿瓒呰繃7鏈�,榛樿琛ㄤ腑鍙湁鏈勾搴︾殑;濡傛灉娌¤秴杩�7鏈�,榛樿琛ㄨ繕瀛樺湪涓婁竴骞村害鐨勮褰�
+ Calendar now = Calendar.getInstance();
+ if(endTimeDate.compareTo(now.getTime())>0){ //鏍￠獙浼樺寲鏈�澶ф煡璇㈡椂闂�
+ endTimeDate = now.getTime();
+ }
+ LinkedHashMap<String,List<Date>> yearTimeMap = (LinkedHashMap<String, List<Date>>) DateUtil.getMonthListDesc(startTimeDate, endTimeDate);
+ Map<String,List<Date>> yearTimeDescMap = new LinkedHashMap<>();
+ boolean existDefaultYear = false;
+ //鏌ヨ鐨勭粨鏉熸椂闂�
+ //if(DateUtil.YYYY_MM_TABLE.format(endTimeDate).equals(DateUtil.YYYY_MM_TABLE.format(now.getTime()))){
+ if(ThreadLocalUtil.format(endTimeDate,2).equals(ThreadLocalUtil.format(now.getTime(),2))){
+ List<Date> defaultDateList = new LinkedList<>();
+ defaultDateList.add(startTimeDate);
+ defaultDateList.add(endTimeDate);
+ }
+ //璋冩暣涓嬮『搴�,灏哾efault璋冩暣鍒伴浣�
+ if(existDefaultYear){
+ List<Date> defaultTimeList = yearTimeMap.get("default");
+ yearTimeDescMap.put("default",defaultTimeList);
+ }
+ Set<String> yearSet = yearTimeMap.keySet();
+ for (String year : yearSet) {
+ if(!year.equals("default")){
+ yearTimeDescMap.put(year,yearTimeMap.get(year));
+ }
+ }
+
+ return yearTimeDescMap;
+ }
+
public static void main(String[] args) throws ParseException {
//Date d1 = YYYY_MM_DD_HH_MM_SS.parse("2023-01-22 14:12:22");
--
Gitblit v1.9.1