diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/task/RoomDailyTaskQueryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/task/RoomDailyTaskQueryExe.java index 2912f92f..b9ff4f24 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/task/RoomDailyTaskQueryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/task/RoomDailyTaskQueryExe.java @@ -12,9 +12,9 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; +import java.sql.Timestamp; import java.time.LocalDate; import java.time.ZonedDateTime; -import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -33,7 +33,7 @@ public class RoomDailyTaskQueryExe { List configs = taskDatabaseService.listEnabledConfigs(taskCategory); RoomDailyTaskListCO result = new RoomDailyTaskListCO(); - result.setCountdownSeconds(calcCountdownSeconds()); + result.setCountdown(calcCountdownSeconds()); if (CollectionUtils.isEmpty(configs)) { result.setTasks(new ArrayList<>()); @@ -59,11 +59,11 @@ public class RoomDailyTaskQueryExe { return result; } - /** 计算距沙特时间今日午夜的剩余秒数 */ - private long calcCountdownSeconds() { + /** 计算沙特时间今日午夜的时间戳 */ + private Timestamp calcCountdownSeconds() { ZonedDateTime now = ZonedDateTimeAsiaRiyadhUtils.now(); ZonedDateTime midnight = now.toLocalDate().plusDays(1).atStartOfDay(now.getZone()); - return ChronoUnit.SECONDS.between(now, midnight); + return Timestamp.from(midnight.toInstant()); } private RoomDailyTaskCO buildTaskCO(RoomDailyTaskConfig config, List tiers, RoomDailyTaskProgress progress) { diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/task/RoomDailyTaskListCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/task/RoomDailyTaskListCO.java index 05b11e50..282b9e98 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/task/RoomDailyTaskListCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/task/RoomDailyTaskListCO.java @@ -2,6 +2,7 @@ package com.red.circle.other.app.dto.clientobject.task; import lombok.Data; +import java.sql.Timestamp; import java.util.List; /** @@ -11,7 +12,7 @@ import java.util.List; public class RoomDailyTaskListCO { /** 距当日结束的剩余秒数(沙特时间午夜重置) */ - private Long countdownSeconds; + private Timestamp countdown; private List tasks; }