From 7baed9209086324dba79d14407579b52628616c8 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 25 十月 2023 11:36:01 +0800
Subject: [PATCH] 34~58PwrdevHistorydataGwController.java;30行
---
src/main/java/com/whyc/util/ThreadLocalUtil.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/util/ThreadLocalUtil.java b/src/main/java/com/whyc/util/ThreadLocalUtil.java
index d5126f9..b8afcaa 100644
--- a/src/main/java/com/whyc/util/ThreadLocalUtil.java
+++ b/src/main/java/com/whyc/util/ThreadLocalUtil.java
@@ -11,6 +11,7 @@
public static ThreadLocal<SimpleDateFormat> sdfwithtime = ThreadLocal.withInitial(() -> new SimpleDateFormat("HH:mm:ss"));
public static ThreadLocal<SimpleDateFormat> sdfwithTABLE=ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyy-MM"));
public static ThreadLocal<SimpleDateFormat> sdfwithtime_yyyyMMdd_HH_mm_ss=ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss"));
+ public static ThreadLocal<SimpleDateFormat> YYYY_MM_DD_HH_MM_SS_UNION=ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyyMMddHHmmss"));
/*
* flag:1(sdf),2(sdfwithOutday),3(sdfwithday),4(sdfwithtime)
@@ -23,7 +24,6 @@
case 2:date=sdfwithOutday.get().parse(timeStr);break;
case 3:date=sdfwithday.get().parse(timeStr);break;
case 4:date=sdfwithtime.get().parse(timeStr);break;
- case 5:date=sdfwithTABLE.get().parse(timeStr);break;
default:date=sdf.get().parse(timeStr);
}
} catch (ParseException e) {
@@ -40,6 +40,7 @@
case 4:timeStr=sdfwithtime.get().format(date);break;
case 5:timeStr=sdfwithTABLE.get().format(date);break;
case 6:timeStr=sdfwithtime_yyyyMMdd_HH_mm_ss.get().format(date);break;
+ case 7:timeStr=YYYY_MM_DD_HH_MM_SS_UNION.get().format(date);break;
default:timeStr=sdf.get().format(date);
}
return timeStr;
--
Gitblit v1.9.1