diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java
index 46814ccd8..1645a7e6c 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java
@@ -958,6 +958,8 @@ public class AppearancePatentTaskService {
log.info("[appearance-patent] llm batch done taskId={} jobId={} rows={} batch={}/{} costMs={}",
task.getId(), job.getId(), batchRows.size(), batchIndex, batchTotal,
System.currentTimeMillis() - startedAt);
+ // 每批刷新任务心跳:软恢复后的检测阶段可达数小时,不刷会被通用兜底线按 updated_at 超 120 分钟误杀(2026-09-28 29473/29479)
+ touchJavaSideTaskActivity(task.getId());
batchIndex++;
}
}
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/controller/BrandTaskController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/controller/BrandTaskController.java
index e3f8459cf..562cb9a6e 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/controller/BrandTaskController.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/controller/BrandTaskController.java
@@ -124,7 +124,7 @@ public class BrandTaskController {
- line_progress.has_progress:当前是否存在 Redis 实时进度;
- line_progress.info.file_index / file_total:当前处理到第几个文件 / 总文件数;
- line_progress.info.file_name:当前处理文件名;
- - line_progress.info.current_line / total_lines:当前文件已处理行数 / 总行数;
+ - line_progress.info.current_line / total_lines:任务级已处理品牌数 / 品牌总数(心跳按数据量上报,只增不减);
- line_progress.info.phase:当前阶段,可能为 crawling / assembling / uploading / failed。
典型用途:
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskProgressCacheService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskProgressCacheService.java
index 0f820e5d9..1c483cddc 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskProgressCacheService.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskProgressCacheService.java
@@ -39,13 +39,18 @@ public class BrandTaskProgressCacheService {
this.objectMapper = objectMapper;
}
+ /**
+ * 分片结果落进度缓存:只写「文件级」字段(当前文件 / 已完文件数)与存活时间戳。
+ *
+ *
current_line / total_lines 自 2026-09-28 起是「任务级品牌数」(由
+ * {@link #touchHeartbeat} 单调写入),不在这里按单文件覆盖——多文件任务下
+ * 单文件的行数会把任务级进度打回去(前端进度条按数据量展示)。
+ */
public void saveProgressFromResult(Long taskId,
String fileUrl,
int fileIndex,
int fileTotal,
String fileName,
- int currentLine,
- int totalLines,
int finishedFiles) {
String key = buildKey(taskId);
String now = String.valueOf(Instant.now().toEpochMilli());
@@ -55,8 +60,6 @@ public class BrandTaskProgressCacheService {
values.put("file_total", String.valueOf(Math.max(fileTotal, 0)));
values.put("file_name", blankToEmpty(fileName));
values.put("file_url", blankToEmpty(fileUrl));
- values.put("current_line", String.valueOf(Math.max(Math.min(currentLine, totalLines), 0)));
- values.put("total_lines", String.valueOf(Math.max(totalLines, 0)));
values.put("finished_files", String.valueOf(Math.max(finishedFiles, 0)));
values.put("updated_at", now);
values.put("last_heartbeat_at", now);
@@ -87,23 +90,48 @@ public class BrandTaskProgressCacheService {
}
}
+ /**
+ * 心跳合并写(原子):current_line / total_lines 只增不减,phase 不被 crawling 打回收尾阶段。
+ *
+ *
品牌任务的心跳由执行方(15126 服务进程)按任务级「已处理品牌数/品牌总数」上报,
+ * 与结果回传、收尾阶段更新可能乱序到达;用 Lua 做「取大写入」,
+ * 避免旧值/单文件值把已展示的进度打回去。ARGV 为空串表示本次不带该字段。
+ */
+ private static final DefaultRedisScript HEARTBEAT_MERGE_SCRIPT = new DefaultRedisScript<>(
+ """
+ local key = KEYS[1]
+ local phase = ARGV[1]
+ if phase ~= '' then
+ local stored = redis.call('hget', key, 'phase')
+ local protect = (stored == 'assembling' or stored == 'uploading' or stored == 'failed')
+ if not (protect and phase == 'crawling') then
+ redis.call('hset', key, 'phase', phase)
+ end
+ end
+ local current = tonumber(ARGV[2])
+ if current ~= nil then
+ local cur = tonumber(redis.call('hget', key, 'current_line')) or 0
+ if current > cur then redis.call('hset', key, 'current_line', current) end
+ end
+ local total = tonumber(ARGV[3])
+ if total ~= nil then
+ local tot = tonumber(redis.call('hget', key, 'total_lines')) or 0
+ if total > tot then redis.call('hset', key, 'total_lines', total) end
+ end
+ redis.call('hset', key, 'updated_at', ARGV[4])
+ redis.call('hset', key, 'last_heartbeat_at', ARGV[4])
+ return 1
+ """, Long.class);
+
public void touchHeartbeat(Long taskId, String phase, Integer current, Integer total) {
String key = buildKey(taskId);
String now = String.valueOf(Instant.now().toEpochMilli());
- Map values = new LinkedHashMap<>();
- values.put("updated_at", now);
- values.put("last_heartbeat_at", now);
- if (phase != null && !phase.isBlank()) {
- values.put("phase", normalizePhase(phase));
- }
- if (current != null) {
- values.put("current_line", String.valueOf(Math.max(current, 0)));
- }
- if (total != null) {
- values.put("total_lines", String.valueOf(Math.max(total, 0)));
- }
try {
- stringRedisTemplate.opsForHash().putAll(key, values);
+ stringRedisTemplate.execute(HEARTBEAT_MERGE_SCRIPT, List.of(key),
+ phase == null || phase.isBlank() ? "" : normalizePhase(phase),
+ current == null ? "" : String.valueOf(Math.max(current, 0)),
+ total == null ? "" : String.valueOf(Math.max(total, 0)),
+ now);
stringRedisTemplate.expire(key, ttl());
} catch (Exception ex) {
log.warn("[brand-progress-cache] touch heartbeat degraded taskId={} msg={}", taskId, ex.getMessage());
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java
index 56e33270e..1b5d1241b 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java
@@ -347,15 +347,12 @@ public class BrandTaskService {
aggregate == null ? 0 : defaultInteger(aggregate.getTotalLines()));
String fileName = blankToDefault(sourceFile.getOriginalFilename(), sourceFile.getFileUrl());
int fileIndex = sourceIndexByUrl.getOrDefault(fileUrl, 0);
- int currentLine = aggregate == null ? 0 : defaultInteger(aggregate.getProcessedLineCount());
- int currentTotalLines = aggregate == null ? 0 : Math.max(defaultInteger(aggregate.getTotalLines()), currentLine);
+ // current_line/total_lines(任务级品牌数)由执行方心跳写入,这里不再按单文件覆盖
brandTaskProgressCacheService.saveProgressFromResult(taskId,
fileUrl,
fileIndex,
totalCount,
fileName,
- currentLine,
- currentTotalLines,
finishedCount);
updateTaskProgress(taskId, finishedCount, totalCount);
saveBrandProgressSnapshot(taskId, STATUS_RUNNING, totalCount, finishedCount, 0, null);
diff --git a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue
index 1eabaf4fd..e9964dc0a 100644
--- a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue
+++ b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue
@@ -803,9 +803,11 @@ function statusText(item: AppearancePatentHistoryItem) {
const status = normalizeTaskStatus(item)
if (status === 'RUNNING') return '执行中'
if (status === 'PENDING') return '已解析待启动'
+ // 已判死(含心跳超时)的任务始终显示失败:后台检测可能仍在跑、文件生成后下载按钮会自动出现,
+ // 但状态文案不能是"结果生成中",否则用户会以为任务还在执行(2026-09-28 29473/29479)
+ if (status === 'FAILED') return isResultBuildFailed(item) ? '结果生成失败' : '失败'
if (isResultPreparing(item)) return '结果生成中'
if (isResultBuildFailed(item)) return '结果生成失败'
- if (status === 'FAILED') return '失败'
if (hasDownloadableResult(item)) return '已完成'
if (status === 'SUCCESS' || item.success) return '已完成'
return '等待中'
@@ -813,8 +815,8 @@ function statusText(item: AppearancePatentHistoryItem) {
function statusClass(item: AppearancePatentHistoryItem) {
const status = normalizeTaskStatus(item)
+ if (status === 'FAILED' || isResultBuildFailed(item)) return 'failed'
if (status === 'RUNNING' || isResultPreparing(item)) return 'running'
- if (isResultBuildFailed(item) || status === 'FAILED') return 'failed'
if (hasDownloadableResult(item)) return 'success'
if (status === 'SUCCESS' || item.success) return 'success'
return 'pending'
@@ -845,14 +847,12 @@ function pendingResultHint(item: AppearancePatentHistoryItem) {
return ''
}
if (!isResultPreparing(item)) return ''
+ const doneLabel = normalizeTaskStatus(item) === 'FAILED' ? '任务已失败' : '任务已完成'
const fileStatus = (item.fileStatus || '').toUpperCase()
- if (fileStatus === 'RUNNING') {
- return '任务已完成,正在生成结果文件,下载按钮稍后出现'
- }
if (fileStatus === 'PENDING') {
- return '任务已完成,结果文件排队中,请稍候'
+ return `${doneLabel},结果文件排队中,请稍候`
}
- return '任务已完成,正在生成结果文件,下载按钮稍后出现'
+ return `${doneLabel},正在生成结果文件,下载按钮稍后出现`
}
function canDownload(item: AppearancePatentHistoryItem) {
diff --git a/frontend-vue/src/shared/api/types/modules/brand.ts b/frontend-vue/src/shared/api/types/modules/brand.ts
index f71ffe0e4..33336a0a6 100644
--- a/frontend-vue/src/shared/api/types/modules/brand.ts
+++ b/frontend-vue/src/shared/api/types/modules/brand.ts
@@ -45,14 +45,14 @@ export interface BrandTaskListResponse {
error?: string
}
-/** Java 详情接口返回的行级进度(Redis 实时进度,每提交一个分片推进 current_line) */
+/** Java 详情接口返回的行级进度(Redis 实时进度,由执行方心跳按任务级品牌数推进) */
export interface BrandLineProgressInfo {
file_index?: number
file_total?: number
file_name?: string
- /** 已处理行/品牌数 */
+ /** 任务级已处理品牌数(只增不减) */
current_line?: number
- /** 总行/品牌数 */
+ /** 任务级品牌总数 */
total_lines?: number
/** crawling / assembling / uploading / failed */
phase?: string
diff --git a/frontend-vue/tests/appearance-patent-failed-status.test.ts b/frontend-vue/tests/appearance-patent-failed-status.test.ts
new file mode 100644
index 000000000..354438db5
--- /dev/null
+++ b/frontend-vue/tests/appearance-patent-failed-status.test.ts
@@ -0,0 +1,43 @@
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import { resolve, dirname } from 'node:path'
+
+const here = dirname(fileURLToPath(import.meta.url))
+const tabSource = readFileSync(
+ resolve(here, '../src/pages/brand/components/BrandAppearancePatentTab.vue'),
+ 'utf-8',
+)
+
+function functionBody(name: string): string {
+ const match = tabSource.match(new RegExp(`function ${name}\\([\\s\\S]*?\\n\\}`))
+ assert.ok(match, `找不到函数 ${name}`)
+ return match[0]
+}
+
+// 心跳超时判死的任务(taskStatus=FAILED)后台检测可能仍在跑、结果文件稍后生成。
+// 此时状态文案必须是"失败"而不是"结果生成中",否则用户会以为任务还在执行、放弃等待/下载(2026-09-28 29473/29479)。
+test('test_failed_status_wins_over_result_preparing', () => {
+ const body = functionBody('statusText')
+ const failedIdx = body.indexOf("'FAILED'")
+ const preparingIdx = body.indexOf('isResultPreparing(item)')
+ assert.ok(failedIdx >= 0, 'statusText 缺少 FAILED 分支')
+ assert.ok(preparingIdx >= 0, 'statusText 缺少 isResultPreparing 分支')
+ assert.ok(failedIdx < preparingIdx, 'FAILED 必须在 isResultPreparing(结果生成中)之前判定')
+})
+
+test('test_failed_class_wins_over_running', () => {
+ const body = functionBody('statusClass')
+ const failedIdx = body.indexOf("=== 'FAILED'")
+ const runningIdx = body.indexOf('isResultPreparing(item)')
+ assert.ok(failedIdx >= 0 && runningIdx >= 0)
+ assert.ok(failedIdx < runningIdx, 'FAILED 必须先于 isResultPreparing 判为 failed 样式')
+ assert.match(body, /return 'failed'/, 'FAILED 应映射为 failed 样式')
+})
+
+test('test_failed_hint_marks_task_failed_and_download_later', () => {
+ const body = functionBody('pendingResultHint')
+ assert.match(body, /'FAILED'\s*\?\s*'任务已失败'/, '提示文案应按 FAILED 切换为任务已失败')
+ assert.match(body, /下载按钮稍后出现/, '失败后仍提示结果文件生成后会给出下载按钮')
+})