From 279c1641ea4d74a43f2fa1b9d9231d20c08931ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Wed, 30 Sep 2026 11:40:00 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=BB=E5=8A=A1=E5=85=9C=E5=BA=95?= =?UTF-8?q?=E6=8B=89=E5=8F=96):=20=E5=80=99=E9=80=89=20cutoff=20=E6=98=BE?= =?UTF-8?q?=E5=BC=8F=E7=94=A8=E5=8C=97=E4=BA=AC=E6=97=B6=E9=97=B4=20?= =?UTF-8?q?=E2=80=94=E2=80=94=20=E5=AE=B9=E5=99=A8=E9=BB=98=E8=AE=A4=20UTC?= =?UTF-8?q?,=20LocalDateTime.now()=20=E4=B8=8E=20DB=20=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E9=9D=A2=E5=80=BC=E6=AF=94=E8=BE=83?= =?UTF-8?q?=E9=94=99=E4=BD=8D=208=20=E5=B0=8F=E6=97=B6,=20=E5=80=99?= =?UTF-8?q?=E9=80=89=E6=9F=A5=E8=AF=A2=E6=81=92=E7=A9=BA(=E5=86=85?= =?UTF-8?q?=E9=83=A8=E8=AE=A4=E9=A2=86=E4=B8=8A=E7=BA=BF=E5=AE=9E=E6=B5=8B?= =?UTF-8?q?=E8=B8=A9=E4=B8=AD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/service/TaskClientPullService.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java index bfd6cad81..0d0953fea 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -39,6 +40,12 @@ public class TaskClientPullService { private static final String STATUS_RUNNING = "RUNNING"; private static final String STATUS_FAILED = "FAILED"; private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + /** + * 任务时间口径统一用北京时间:容器默认 UTC 时区,LocalDateTime.now() 与 + * DB(datetime 列存北京时间字面值)直接比较会错位 8 小时 —— 表现为候选查询 + * 永远为空(created_at 恒大于 UTC 口径的 cutoff)。2026-09-30 上线内部认领时实测踩中。 + */ + private static final ZoneId DB_ZONE = ZoneId.of("Asia/Shanghai"); /** 单次拉取上限,防止配置写大后一次认领过多把客户端队列压满。 */ private static final int MAX_LIMIT = 20; @@ -94,8 +101,8 @@ public class TaskClientPullService { */ @PostConstruct public void logEffectiveConfig() { - log.info("[client-task-pull] 生效配置 enabled={} moduleTypes={} minPendingMinutes={} limit={} handlers={}", - enabled, moduleTypes, minPendingMinutes, Math.max(1, Math.min(limit, MAX_LIMIT)), pullHandlers.keySet()); + log.info("[client-task-pull] 生效配置 enabled={} internalEnabled={} moduleTypes={} minPendingMinutes={} limit={} handlers={}", + enabled, internalEnabled, moduleTypes, minPendingMinutes, Math.max(1, Math.min(limit, MAX_LIMIT)), pullHandlers.keySet()); } /** 拉取并认领该用户"长期未被领取"的任务,按创建时间升序返回,最多 limit 条。 */ @@ -112,7 +119,7 @@ public class TaskClientPullService { return List.of(); } long startedAt = System.currentTimeMillis(); - LocalDateTime cutoff = LocalDateTime.now().minusMinutes(Math.max(1L, minPendingMinutes)); + LocalDateTime cutoff = LocalDateTime.now(DB_ZONE).minusMinutes(Math.max(1L, minPendingMinutes)); int safeLimit = Math.max(1, Math.min(limit, MAX_LIMIT)); List candidates = fileTaskMapper.selectList(new LambdaQueryWrapper() .select(FileTaskEntity::getId, FileTaskEntity::getModuleType, FileTaskEntity::getCreatedAt) @@ -137,6 +144,7 @@ public class TaskClientPullService { */ public List pullPendingTasksInternal(List moduleTypes) { if (!internalEnabled) { + log.info("[client-task-pull] 内部认领端点被调用但开关关闭 types={}", moduleTypes); return List.of(); } List types = normalizeModuleTypes(moduleTypes); @@ -145,7 +153,7 @@ public class TaskClientPullService { return List.of(); } long startedAt = System.currentTimeMillis(); - LocalDateTime cutoff = LocalDateTime.now().minusMinutes(Math.max(1L, minPendingMinutes)); + LocalDateTime cutoff = LocalDateTime.now(DB_ZONE).minusMinutes(Math.max(1L, minPendingMinutes)); int safeLimit = Math.max(1, Math.min(limit, MAX_LIMIT)); List candidates = fileTaskMapper.selectList(new LambdaQueryWrapper() .select(FileTaskEntity::getId, FileTaskEntity::getModuleType, FileTaskEntity::getCreatedAt)