🐛 fix: Update file time processing logic to support local time format.
This commit is contained in:
parent
0c5016e3f3
commit
1f000348ae
1 changed files with 3 additions and 2 deletions
|
|
@ -236,7 +236,8 @@ public class FileRepositoryImpl implements FileRepository {
|
||||||
WHEN #{timeRange} = 2 THEN '%Y-%m-%d %H:00'
|
WHEN #{timeRange} = 2 THEN '%Y-%m-%d %H:00'
|
||||||
WHEN #{timeRange} IN (3, 4) THEN '%Y-%m-%d'
|
WHEN #{timeRange} IN (3, 4) THEN '%Y-%m-%d'
|
||||||
END,
|
END,
|
||||||
datetime(completion_date / 1000, 'unixepoch')
|
datetime(completion_date / 1000, 'unixepoch'),
|
||||||
|
'localtime'
|
||||||
) AS time,
|
) AS time,
|
||||||
COUNT(*) AS total
|
COUNT(*) AS total
|
||||||
FROM file_record
|
FROM file_record
|
||||||
|
|
@ -261,7 +262,7 @@ public class FileRepositoryImpl implements FileRepository {
|
||||||
// Statistics grouped by five minutes
|
// Statistics grouped by five minutes
|
||||||
return rs.stream()
|
return rs.stream()
|
||||||
.peek(c -> c.put("time", MessyUtils.withGrouping5Minutes(
|
.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)))
|
).format(DatePattern.NORM_DATETIME_MINUTE_FORMATTER)))
|
||||||
.collect(Collectors.groupingBy(c -> c.getString("time"),
|
.collect(Collectors.groupingBy(c -> c.getString("time"),
|
||||||
Collectors.summingInt(c -> c.getInteger("total"))
|
Collectors.summingInt(c -> c.getInteger("total"))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue