From 1f000348ae12ec459a5ba4b444b773642f37f076 Mon Sep 17 00:00:00 2001 From: jarvis2f <137974272+jarvis2f@users.noreply.github.com> Date: Tue, 7 Jan 2025 17:40:20 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20Update=20file=20time=20pr?= =?UTF-8?q?ocessing=20logic=20to=20support=20local=20time=20format.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../telegram/files/repository/impl/FileRepositoryImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/telegram/files/repository/impl/FileRepositoryImpl.java b/api/src/main/java/telegram/files/repository/impl/FileRepositoryImpl.java index ba17284..b3ef7b5 100644 --- a/api/src/main/java/telegram/files/repository/impl/FileRepositoryImpl.java +++ b/api/src/main/java/telegram/files/repository/impl/FileRepositoryImpl.java @@ -236,7 +236,8 @@ public class FileRepositoryImpl implements FileRepository { WHEN #{timeRange} = 2 THEN '%Y-%m-%d %H:00' WHEN #{timeRange} IN (3, 4) THEN '%Y-%m-%d' END, - datetime(completion_date / 1000, 'unixepoch') + datetime(completion_date / 1000, 'unixepoch'), + 'localtime' ) AS time, COUNT(*) AS total FROM file_record @@ -261,7 +262,7 @@ public class FileRepositoryImpl implements FileRepository { // Statistics grouped by five minutes return rs.stream() .peek(c -> c.put("time", MessyUtils.withGrouping5Minutes( - DateUtil.toLocalDateTime(DateUtil.date(Convert.toLong(c.getString("time"), 0L))) + DateUtil.parseLocalDateTime(c.getString("time"), DatePattern.NORM_DATETIME_MINUTE_PATTERN) ).format(DatePattern.NORM_DATETIME_MINUTE_FORMATTER))) .collect(Collectors.groupingBy(c -> c.getString("time"), Collectors.summingInt(c -> c.getInteger("total"))