From 3456d8bc7051e5bff76b5c366a314724768ca232 Mon Sep 17 00:00:00 2001 From: dashixiong Date: Thu, 23 Apr 2026 15:04:46 +0800 Subject: [PATCH] =?UTF-8?q?timestamp=20=E5=85=BC=E5=AE=B9=E7=A7=92?= =?UTF-8?q?=E5=92=8C=E6=AF=AB=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sipai/tools/CommUtil.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sipai/tools/CommUtil.java b/src/main/java/com/sipai/tools/CommUtil.java index 0b4e808..e543064 100644 --- a/src/main/java/com/sipai/tools/CommUtil.java +++ b/src/main/java/com/sipai/tools/CommUtil.java @@ -181,7 +181,17 @@ public class CommUtil { format = "yyyy-MM-dd HH:mm:ss"; } SimpleDateFormat sdf = new SimpleDateFormat(format); - return sdf.format(new Date(Long.valueOf(seconds))); + String timestamp = seconds.trim(); + int dotIndex = timestamp.indexOf('.'); + if (dotIndex > -1) { + timestamp = timestamp.substring(0, dotIndex); + } + long timeValue = Long.parseLong(timestamp); + // 兼容秒级和毫秒级时间戳：10位附近按秒处理，13位附近按毫秒处理。 + if (Math.abs(timeValue) < 100000000000L) { + timeValue = timeValue * 1000L; + } + return sdf.format(new Date(timeValue)); } /** @@ -242,4 +252,3 @@ public class CommUtil { -