From 538ba7a3bbc682f4537f1dd34f93feb2cf56b08e Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 14 十月 2025 17:32:04 +0800
Subject: [PATCH] 2025.10.14 1. 新增数据统计颗粒度选项，可选秒级数据、分钟数据进行数据统计 2. 典型隐患区域统计新增按照污染溯源区域进行分类统计的功能
---
src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt | 5 +++--
1 files changed, 3 insertions(+), 2 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..52149ff 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)
}
@@ -650,7 +650,7 @@
* @param date 鏃ユ湡
* @return 鏃堕棿
*/
- fun getTime(date: Date): String? {
+ fun getTime(date: Date?): String? {
return dateToString(date, DateStyle.HH_MM_SS)
}
@@ -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