From 53857f42f777e2b9753b8f00cce1a60ce3dcb8fd Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期三, 15 十月 2025 22:42:29 +0800
Subject: [PATCH] 2025.10.15 修改高德地图地理逆编码结果，让地理位置信息更加详细

---
 src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt |   40 +++++++++++++++++++++++++++++-----------
 1 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt b/src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt
index 0b77150..52149ff 100644
--- a/src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt
+++ b/src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt
@@ -5,7 +5,24 @@
 import java.text.SimpleDateFormat
 import java.util.*
 
-class DateUtil {
+class DateUtil private constructor(){
+
+    companion object {
+        @Volatile
+        private var dateUtil: DateUtil? = null
+
+        @JvmStatic
+        val instance: DateUtil
+        get() {
+            if (dateUtil == null) {
+                synchronized(DateUtil::class.java) {
+                    dateUtil = DateUtil()
+                }
+            }
+            return dateUtil!!
+        }
+    }
+
     private val threadLocal = ThreadLocal<SimpleDateFormat>()
 
     private val `object` = Any()
@@ -61,7 +78,7 @@
         if (dateStyle != null) {
             var myDate = StringToDate(date, dateStyle)
             myDate = addInteger(myDate, dateType, amount)
-            dateString = DateToString(myDate, dateStyle)
+            dateString = dateToString(myDate, dateStyle)
         }
         return dateString
     }
@@ -213,7 +230,7 @@
      * @param date 鏃ユ湡瀛楃涓�
      * @return 鏃ユ湡
      */
-    fun StringToDate(date: String): Date? {
+    fun StringToDate(date: String?): Date? {
         val dateStyle = getDateStyle(date)
         return StringToDate(date, dateStyle)
     }
@@ -259,7 +276,7 @@
     fun LongToString(millisecondStamp: Long?, dateStyle: DateStyle?): String? {
         var dateString: String? = null
         if (dateStyle != null) {
-            dateString = DateToString(Date(millisecondStamp!!), dateStyle.value)
+            dateString = dateToString(Date(millisecondStamp!!), dateStyle.value)
         }
         return dateString
     }
@@ -270,7 +287,7 @@
      * @param pattern 鏃ユ湡鏍煎紡
      * @return 鏃ユ湡瀛楃涓�
      */
-    fun DateToString(date: Date?, pattern: String): String? {
+    fun dateToString(date: Date?, pattern: String): String? {
         var dateString: String? = null
         if (date != null) {
             try {
@@ -287,10 +304,10 @@
      * @param dateStyle 鏃ユ湡椋庢牸
      * @return 鏃ユ湡瀛楃涓�
      */
-    fun DateToString(date: Date?, dateStyle: DateStyle?): String? {
+    fun dateToString(date: Date?, dateStyle: DateStyle?): String? {
         var dateString: String? = null
         if (dateStyle != null) {
-            dateString = DateToString(date, dateStyle.value)
+            dateString = dateToString(date, dateStyle.value)
         }
         return dateString
     }
@@ -325,7 +342,7 @@
      * @return 鏂版棩鏈熷瓧绗︿覆
      */
     fun StringToString(date: String, olddPattern: String, newPattern: String): String? {
-        return DateToString(StringToDate(date, olddPattern), newPattern)
+        return dateToString(StringToDate(date, olddPattern), newPattern)
     }
 
     /**
@@ -616,7 +633,7 @@
      * @return 鏃ユ湡
      */
     fun getDate(date: Date?): String? {
-        return DateToString(date, DateStyle.YYYY_MM_DD)
+        return dateToString(date, DateStyle.YYYY_MM_DD)
     }
 
     /**
@@ -633,8 +650,8 @@
      * @param date 鏃ユ湡
      * @return 鏃堕棿
      */
-    fun getTime(date: Date): String? {
-        return DateToString(date, DateStyle.HH_MM_SS)
+    fun getTime(date: Date?): String? {
+        return dateToString(date, DateStyle.HH_MM_SS)
     }
 
     /**
@@ -709,6 +726,7 @@
         YYYY_MM_DD_HH("yyyyMMddHH", false),
         YYYY_MM_DD_HH_MM("yyyy-MM-dd HH:mm", false),
         YYYY_MM_DD_HH_MM_SS("yyyy-MM-dd HH:mm:ss", false),
+        YYYY_MM_DD_HH_MM_SS_M("yyyy-MM-dd HH:mm:ss.sss", false),
 
         YYYY_MM_EN("yyyy/MM", false),
         YYYY_MM_DD_EN("yyyy/MM/dd", false),

--
Gitblit v1.9.3