From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 166 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
index e2a19ea..f38c491 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
@@ -18,7 +18,7 @@
- private static TimeZone tz = TimeZone.getTimeZone("GMT+8");
+ private static TimeZone tz = TimeZone.getTimeZone("GMT+0");
// private static TimeZone tz = TimeZone.getTimeZone("Asia/Shanghai");
@@ -598,7 +598,7 @@
* @return
*/
public static long getMillisecond_strDmy(String date) {
- SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if ("".equals(date)) {
date = sdf.format(DateUtil.getDate());
}
@@ -1120,7 +1120,170 @@
return defaultStartDate + "," + defaultEndDate;
}
-
+
+
+
+
+ /**
+ * 多语言时间日期格式转换
+ * @param language 语言编号
+ * @param datetime 标准格式化时间 yyyy-MM-dd
+ * @return
+ */
+ public static String conversionFormat(Integer language, String datetime){
+ String time = "";
+ String date = datetime;
+ int index = datetime.indexOf(" ");
+ if(index != -1){
+ time = datetime.substring(datetime.indexOf(" ") + 1);
+ date = datetime.substring(0, datetime.indexOf(" "));
+ }
+ String[] split = date.split("-");
+ switch (language){
+ case 2:
+ split[1] = englishMonth(Integer.valueOf(split[1]));
+ datetime = split[1] + " " + split[2] + ", " + split[0];
+ if(index != -1){
+ datetime += " " + time;
+ }
+ break;
+ case 3:
+ split[1] = frenchMonth(Integer.valueOf(split[1]));
+ datetime = split[2] + " " + split[1] + " " + split[0];
+ if(index != -1){
+ datetime += " " + time;
+ }
+ break;
+ }
+ return datetime;
+ }
+
+
+ public static String conversionFormat1(Integer language, String datetime){
+ String time = "";
+ String date = datetime;
+ int index = datetime.indexOf(" ");
+ if(index != -1){
+ time = datetime.substring(datetime.indexOf(" ") + 1);
+ date = datetime.substring(0, datetime.indexOf(" "));
+ }
+ String[] split = date.split("-");
+ switch (language){
+ case 2:
+ split[1] = englishMonth(Integer.valueOf(split[0]));
+ datetime = split[0] + " " + split[1];
+ if(index != -1){
+ datetime += " " + time;
+ }
+ break;
+ case 3:
+ split[1] = frenchMonth(Integer.valueOf(split[0]));
+ datetime = split[1] + " " + split[0];
+ if(index != -1){
+ datetime += " " + time;
+ }
+ break;
+ }
+ return datetime;
+ }
+
+
+
+ public static String frenchMonth(Integer month){
+ String m = "";
+ switch (month){
+ case 1:
+ m = "Janvier";
+ break;
+ case 2:
+ m = "Février";
+ break;
+ case 3:
+ m = "Mars";
+ break;
+ case 4:
+ m = "Avril";
+ break;
+ case 5:
+ m = "Mai";
+ break;
+ case 6:
+ m = "Juin";
+ break;
+ case 7:
+ m = "Juillet";
+ break;
+ case 8:
+ m = "Août";
+ break;
+ case 9:
+ m = "Septembre";
+ break;
+ case 10:
+ m = "Octobre";
+ break;
+ case 11:
+ m = "Novembre";
+ break;
+ case 12:
+ m = "Décembre";
+ break;
+ default:
+ m = "";
+ break;
+ }
+ return m;
+ }
+
+
+
+ public static String englishMonth(Integer month){
+ String m = "";
+ switch (month){
+ case 1:
+ m = "January";
+ break;
+ case 2:
+ m = "February";
+ break;
+ case 3:
+ m = "March";
+ break;
+ case 4:
+ m = "April";
+ break;
+ case 5:
+ m = "May";
+ break;
+ case 6:
+ m = "June";
+ break;
+ case 7:
+ m = "July";
+ break;
+ case 8:
+ m = "August";
+ break;
+ case 9:
+ m = "September";
+ break;
+ case 10:
+ m = "October";
+ break;
+ case 11:
+ m = "November";
+ break;
+ case 12:
+ m = "December";
+ break;
+ default:
+ m = "";
+ break;
+ }
+ return m;
+ }
+
+
public static void main(String[] args) throws ParseException {
--
Gitblit v1.7.1