From 51c5fe112976986cb7bbb74a67098dc1fa6d51c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com>
Date: Sun, 13 Sep 2026 15:46:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=BB=E5=8A=A1=E4=B8=AD=E6=96=AD):=20?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=88=E6=80=81=E4=BB=BB=E5=8A=A1=E4=B9=9F=E5=B9=82?=
 =?UTF-8?q?=E7=AD=89=E5=88=B7=E6=96=B0=E7=BC=93=E5=AD=98/=E5=BF=AB?=
 =?UTF-8?q?=E7=85=A7=EF=BC=8C=E4=BF=AE=E5=8E=86=E5=8F=B2=E9=81=97=E7=95=99?=
 =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86=E4=B8=AD=E5=8D=A1=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

第一次修复只在 DB 刚被改成 FAILED 时同步缓存；对 DB 已是终态、但 Redis 里
仍缓存 RUNNING 的历史任务不生效（真机：28094 反复调中断仍返回 progress=RUNNING）。
现在无论是否刚更新 DB，都按 DB 现值同步模块缓存与进度快照，可自愈。
---
 .../task/service/TaskHeartbeatService.java    | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatService.java
index debe652b..6344506b 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatService.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatService.java
@@ -143,21 +143,19 @@ public class TaskHeartbeatService {
             if (updated > 0) {
                 log.warn("[task-interrupted] file task marked failed by client restart taskId={} moduleType={} reason={}",
                         taskId, fileTask.getModuleType(), safeReason);
-                // 同步模块缓存与进度快照：progress/batch 读缓存/快照，不刷新会让前端
-                // 一直按 RUNNING 渲染（任务面板永远"处理中"并阻塞该工具后续任务）。
-                try {
-                    fileTask.setStatus("FAILED");
-                    fileTask.setErrorMessage(safeReason);
-                    fileTask.setFinishedAt(LocalDateTime.now());
-                    saveFileTaskCache(fileTask.getModuleType(), fileTask);
-                    taskProgressSnapshotService.markTerminal(taskId, fileTask.getModuleType(), "FAILED", safeReason);
-                } catch (Exception cacheEx) {
-                    log.warn("[task-interrupted] refresh cache/snapshot failed taskId={} err={}",
-                            taskId, cacheEx.getMessage());
-                }
+                // 同步模块缓存与进度快照：progress/batch 读缓存/快照（Redis，跨实例共享、
+                // 不随 JVM 重启清空），不刷新会让前端一直按 RUNNING 渲染
+                // （任务面板永远"处理中"并阻塞该工具后续任务）。
+                fileTask.setStatus("FAILED");
+                fileTask.setErrorMessage(safeReason);
+                fileTask.setFinishedAt(LocalDateTime.now());
+                syncTerminalState(fileTask, "FAILED", safeReason);
                 return TaskHeartbeatVo.notAlive(fileTask.getModuleType(), "FAILED", "marked failed");
             }
             log.info("[task-interrupted] file task not in RUNNING, skipped taskId={} status={}", taskId, status);
+            // 已终态但缓存/快照仍残留 RUNNING 时（历史遗留或上一次中断未刷缓存）自愈：
+            // 幂等按 DB 现值刷新，避免前端被旧缓存永久卡住。
+            syncTerminalState(fileTask, status, fileTask.getErrorMessage());
             return TaskHeartbeatVo.notAlive(fileTask.getModuleType(), status, "task is not running");
         }
         BrandCrawlTaskEntity brandTask = selectBrandTask(taskId);
@@ -355,6 +353,20 @@ public class TaskHeartbeatService {
         }
     }
 
+    /** 把终态同步到模块缓存与进度快照；失败只告警，不影响中断接口本身的成功语义。 */
+    private void syncTerminalState(FileTaskEntity task, String status, String message) {
+        if (task == null || task.getId() == null) {
+            return;
+        }
+        try {
+            saveFileTaskCache(task.getModuleType(), task);
+            taskProgressSnapshotService.markTerminal(task.getId(), task.getModuleType(), status, message);
+        } catch (Exception ex) {
+            log.warn("[task-interrupted] refresh cache/snapshot failed taskId={} err={}",
+                    task.getId(), ex.getMessage());
+        }
+    }
+
     private void putIfPresent(Map<String, String> values, String key, Object value) {
         if (value != null) {
             values.put(key, String.valueOf(value));