From 9d4ca2e7bdfc0d634b0cc27c7fbe23740f4bb398 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 十二月 2024 15:43:30 +0800
Subject: [PATCH] 1. 新增aod数据索引，aod详细数据实体类，mapper，service 2. 新增卫星遥测数据网格数据pm2.5、aod数据导入，模板下载 3. FileExchange.kt 新增转换pm2.5和aod数据方法
---
src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt | 3 ++-
1 files changed, 2 insertions(+), 1 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 62d5219..0e26e93 100644
--- a/src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt
+++ b/src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt
@@ -230,7 +230,7 @@
* @param date 鏃ユ湡瀛楃涓�
* @return 鏃ユ湡
*/
- fun StringToDate(date: String): Date? {
+ fun StringToDate(date: String?): Date? {
val dateStyle = getDateStyle(date)
return StringToDate(date, dateStyle)
}
@@ -726,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