hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

roomDailyTask 返回时间戳类型。

Browse Source
This commit is contained in:
tianfeng 2026-03-04 11:20:16 +08:00
parent 345c9f2e06
commit 786c9263bf
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/task/RoomDailyTaskQueryExe.java
View File

@ -12,9 +12,9 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.sql.Timestamp;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -33,7 +33,7 @@ public class RoomDailyTaskQueryExe {
List<RoomDailyTaskConfig> configs = taskDatabaseService.listEnabledConfigs(taskCategory); List<RoomDailyTaskConfig> configs = taskDatabaseService.listEnabledConfigs(taskCategory);
RoomDailyTaskListCO result = new RoomDailyTaskListCO(); RoomDailyTaskListCO result = new RoomDailyTaskListCO();
result.setCountdownSeconds(calcCountdownSeconds()); result.setCountdown(calcCountdownSeconds());
if (CollectionUtils.isEmpty(configs)) { if (CollectionUtils.isEmpty(configs)) {
result.setTasks(new ArrayList<>()); result.setTasks(new ArrayList<>());
@ -59,11 +59,11 @@ public class RoomDailyTaskQueryExe {
return result; return result;
} }
/** 计算距沙特时间今日午夜的剩余秒数 */ /** 计算沙特时间今日午夜的时间戳 */
private long calcCountdownSeconds() { private Timestamp calcCountdownSeconds() {
ZonedDateTime now = ZonedDateTimeAsiaRiyadhUtils.now(); ZonedDateTime now = ZonedDateTimeAsiaRiyadhUtils.now();
ZonedDateTime midnight = now.toLocalDate().plusDays(1).atStartOfDay(now.getZone()); 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<RoomDailyTaskTier> tiers, RoomDailyTaskProgress progress) { private RoomDailyTaskCO buildTaskCO(RoomDailyTaskConfig config, List<RoomDailyTaskTier> tiers, RoomDailyTaskProgress progress) {

3
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/task/RoomDailyTaskListCO.java
View File

@ -2,6 +2,7 @@ package com.red.circle.other.app.dto.clientobject.task;
import lombok.Data; import lombok.Data;
import java.sql.Timestamp;
import java.util.List; import java.util.List;
/** /**
@ -11,7 +12,7 @@ import java.util.List;
public class RoomDailyTaskListCO { public class RoomDailyTaskListCO {
/** 距当日结束的剩余秒数（沙特时间午夜重置） */ /** 距当日结束的剩余秒数（沙特时间午夜重置） */
private Long countdownSeconds; private Timestamp countdown;
private List<RoomDailyTaskCO> tasks; private List<RoomDailyTaskCO> tasks;
} }