From 6d52b95d85dcfa29ed3ab575255b26e4aa46296c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Thu, 22 Oct 2026 15:34:36 +0800 Subject: [PATCH] =?UTF-8?q?fix(task-board):=20=E4=BB=BB=E5=8A=A1=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E5=81=87=E6=AD=BB=E8=87=AA=E6=95=91=E2=80=94=E2=80=94?= =?UTF-8?q?=E8=BD=AE=E8=AF=A2=E5=A4=B1=E8=B4=A5=E9=80=80=E9=81=BF=E9=87=8D?= =?UTF-8?q?=E8=AF=95=EF=BC=8B=E9=9D=A2=E6=9D=BF=E5=88=B7=E6=96=B0=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8B=E8=A1=A5=E6=A3=80=E8=BD=AE=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit task 31769:外观专利任务后端 18:08 已 SUCCESS,但页面卡片冻在「正在组装 xlsx 92%」 一天多——Patent 轮询配的 propagate 让一次瞬时错误永久杀死轮询,且无自救出口。 - useLiveTaskBoard 摘除 pollErrorMode:失败一律吞掉重试,连续失败按倍数降频(封顶 5x) - TaskCenterPanel 头部新增「刷新」按钮,外观专利/货源查询两页接上(强拉 history+dashboard) - 补检轮触发时进度文案改「有 N 行未完成检测,补检中」,不再停在「正在组装 xlsx」假死 - 回归:AppearancePatentRecheckProgressMessageTest+task-board-poll-resilience.test.ts --- .../AppearancePatentResultJobSupport.java | 7 +- ...rancePatentRecheckProgressMessageTest.java | 86 +++++++++++++++++++ .../components/BrandAppearancePatentTab.vue | 13 ++- .../brand/components/BrandSimilarAsinTab.vue | 12 ++- .../components/tasks/TaskCenterPanel.vue | 47 +++++++++- .../shared/composables/useLiveTaskBoard.ts | 33 +++---- .../tests/task-board-poll-resilience.test.ts | 56 ++++++++++++ 7 files changed, 228 insertions(+), 26 deletions(-) create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentRecheckProgressMessageTest.java create mode 100644 frontend-vue/tests/task-board-poll-resilience.test.ts diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentResultJobSupport.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentResultJobSupport.java index 55b840330..a955f49bb 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentResultJobSupport.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentResultJobSupport.java @@ -362,9 +362,14 @@ public class AppearancePatentResultJobSupport { progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, assembleProgress, "正在组装 xlsx"); // 补检决定必须做在出表之前:assembleResultWorkbook 一跑完就把 xlsx 传上 OSS 并挂好 // resultFileUrl,那时才发现缺口,半张表已经在用户的下载列表里了。 - if (deliverySupport.requestRecheckForMissingRows(task, job, deliverySupport.measureDeliveryFacts(task, result))) { + AppearancePatentRowOutcome.Facts gap = deliverySupport.measureDeliveryFacts(task, result); + if (deliverySupport.requestRecheckForMissingRows(task, job, gap)) { // 半张表先不发出去:撤销未完成行的检测标记、把作业排回队列补检一轮, // 上限由行级轮次闸(llmRowMaxRounds)与补检轮次闸(recheckMaxRounds)共同兜住。 + // 进度消息同步换掉「正在组装 xlsx」:补检一轮常要几十分钟,卡片停在 92% 假死 + // (task 31769 实录),用户要看得见是在补检、不是卡死。百分比由快照棘轮保持不回退。 + progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, assembleProgress, + "有 " + gap.missingRows() + " 行未完成检测,补检中"); return false; } AppearancePatentRowOutcome.Facts deliveryFacts = assembleResultWorkbook(task, result); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentRecheckProgressMessageTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentRecheckProgressMessageTest.java new file mode 100644 index 000000000..4864513b3 --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentRecheckProgressMessageTest.java @@ -0,0 +1,86 @@ +package com.nanri.aiimage.modules.appearancepatent.service.support; + +import com.nanri.aiimage.modules.task.model.entity.FileResultEntity; +import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; +import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.util.ReflectionTestUtils; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * 补检轮触发时进度文案必须换掉「正在组装 xlsx」(task 31769): + * 补检一轮常要几十分钟,卡片一直停在 92%「正在组装 xlsx」,用户只能当成卡死; + * 页面轮询恰好又被一次瞬时错误杀死后,这张假死卡挂了一天多(后端实际早已 SUCCESS)。 + * 这里钉住:recheck 分支要在返回 false 前把进度消息写成「有 N 行未完成检测,补检中」, + * 首条「正在组装 xlsx」保持不变(组装阶段照旧)。 + */ +@ExtendWith(MockitoExtension.class) +class AppearancePatentRecheckProgressMessageTest { + + @Mock private AppearancePatentDeliverySupport deliverySupport; + @Mock private AppearancePatentProgressSupport progressSupport; + + @Test + void recheckRoundWritesGapProgressInsteadOfFrozenAssembleMessage() { + AppearancePatentRowOutcome.Facts gap = + new AppearancePatentRowOutcome.Facts(5, 3, 0, List.of("B0AAAA", "B0BBBB")); + when(deliverySupport.measureDeliveryFacts(task(), result())).thenReturn(gap); + when(deliverySupport.requestRecheckForMissingRows(task(), job(), gap)).thenReturn(true); + + Boolean proceeded = ReflectionTestUtils.invokeMethod(support(), "completeLlmFileJob", + task(), result(), job(), 6); + + assertFalse(proceeded, "补检轮触发时 completeLlmFileJob 必须返回 false(作业排回队列)"); + ArgumentCaptor message = ArgumentCaptor.forClass(String.class); + verify(progressSupport, times(2)).saveFileBuildProgress(eq(task()), eq(job()), eq(6), anyInt(), message.capture()); + assertEquals("正在组装 xlsx", message.getAllValues().get(0)); + assertEquals("有 2 行未完成检测,补检中", message.getAllValues().get(1)); + } + + private AppearancePatentResultJobSupport support() { + // 仅 deliverySupport / progressSupport 参与补检分支,其余协作者传 null(构造器只赋值) + return new AppearancePatentResultJobSupport( + "APPEARANCE_PATENT", 0L, null, null, + null, null, null, null, null, null, null, + null, null, null, deliverySupport, progressSupport, null, + null, null, null, null, null, null, null); + } + + private FileTaskEntity task() { + FileTaskEntity task = new FileTaskEntity(); + task.setId(31769L); + task.setModuleType("APPEARANCE_PATENT"); + task.setStatus("RUNNING"); + return task; + } + + private TaskFileJobEntity job() { + TaskFileJobEntity job = new TaskFileJobEntity(); + job.setId(22741L); + job.setTaskId(31769L); + job.setResultId(34819L); + job.setStatus("RUNNING"); + return job; + } + + private FileResultEntity result() { + FileResultEntity result = new FileResultEntity(); + result.setId(34819L); + result.setTaskId(31769L); + result.setModuleType("APPEARANCE_PATENT"); + return result; + } +} diff --git a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue index 4ce02ab65..65e2907f7 100644 --- a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue @@ -37,6 +37,7 @@
({ } return { taskIds, force: true } }, - // 轮询回调抛错时上抛、轮询停止(与原实现一致) - pollErrorMode: 'propagate', getPendingParseItem: () => pendingParseItem.value, download: { buildUrl: (resultId) => getAppearancePatentResultDownloadUrl(resultId), @@ -188,6 +187,16 @@ const board = useLiveTaskBoard({ }) const visibleTaskSummary = computed(() => parseResult.value || queuedTaskSummary.value) + +/** 手动刷新:强拉历史 + 统计 + 当前轮询任务进度(轮询意外中断后的自救出口) */ +async function refreshBoard() { + await Promise.all([ + board.loadDashboard(), + board.loadHistory({ force: true }), + board.refreshTaskProgress(), + ]) +} + const pendingParseItem = computed(() => { const result = parseResult.value if (!result?.taskId) return null diff --git a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue index a69ed0b89..6f513d792 100644 --- a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue @@ -77,6 +77,7 @@
({ pendingIds.forEach((taskId) => forceThrottle.markForce(taskId)) } }, - // 瞬时请求失败不打断轮询(与原实现一致) - pollErrorMode: 'swallow', onPendingFileTaskRemoved: (taskId) => forceThrottle.clear(taskId), getPendingParseItem: () => pendingParseItem.value, download: { @@ -270,6 +269,15 @@ const currentTaskViews = computed(() => board.currentItems.value const historyTaskViews = computed(() => board.historyOnlyItems.value.map(toAsinTaskView)) +/** 手动刷新:强拉历史 + 统计 + 当前轮询任务进度(轮询意外中断后的自救出口) */ +async function refreshBoard() { + await Promise.all([ + board.loadDashboard(), + board.loadHistory({ force: true }), + board.refreshTaskProgress(), + ]) +} + function itemSource(item: TaskItemView): SimilarAsinHistoryItem { return item.source as SimilarAsinHistoryItem } diff --git a/frontend-vue/src/shared/components/tasks/TaskCenterPanel.vue b/frontend-vue/src/shared/components/tasks/TaskCenterPanel.vue index 516483783..54c4d6610 100644 --- a/frontend-vue/src/shared/components/tasks/TaskCenterPanel.vue +++ b/frontend-vue/src/shared/components/tasks/TaskCenterPanel.vue @@ -1,7 +1,12 @@