From 96b090dfd5f2d10561312f8b8d732250263b6aba 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, 1 Nov 2026 00:46:08 +0800 Subject: [PATCH] =?UTF-8?q?feat(task-retry):=20=E9=87=8D=E8=AF=95=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=8E=A8=E5=B9=BF=E5=88=B0=E7=9B=B8=E4=BC=BCASIN?= =?UTF-8?q?=E4=B8=8E=E9=87=87=E9=9B=86=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 同类问题一起修:这两个模块与外观专利共用同一条自动重试(原先也克隆重试)。 - 新增通用端点 POST /api/tasks/{taskId}/retry(模块无关,从任务行取 moduleType) - 两页失败任务在「删除」前显示「重试」,调用后在原任务上复位续跑 - catch 棘轮 308→310,两处均 ElMessage 可见出口 --- .../task/controller/TaskRetryController.java | 47 +++++++++++++++++++ .../task/service/TaskInPlaceRetryService.java | 14 ++++++ .../brand/components/BrandCollectDataTab.vue | 25 ++++++++++ .../brand/components/BrandSimilarAsinTab.vue | 25 ++++++++++ frontend-vue/src/shared/api/task-retry.ts | 18 +++++++ .../tests/catch-silence-ratchet.test.ts | 5 +- 6 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskRetryController.java create mode 100644 frontend-vue/src/shared/api/task-retry.ts diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskRetryController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskRetryController.java new file mode 100644 index 000000000..c1666bef0 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskRetryController.java @@ -0,0 +1,47 @@ +package com.nanri.aiimage.modules.task.controller; + +import com.nanri.aiimage.common.api.ApiResponse; +import com.nanri.aiimage.common.security.AdminAuthSupport; +import com.nanri.aiimage.modules.task.service.TaskInPlaceRetryService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * 失败任务重试(模块无关,2026-11-01 用户拍板)。 + * + *
口径:失败任务不再自动克隆新任务(同一份输入会多出好几行结果),改由用户在
+ * 「删除」旁点「重试」——在原任务上复位续跑,保留已收分片、解析载荷与已检测标记。
+ * 外观专利另有模块专属端点 {@code /api/appearance-patent/tasks/{id}/retry},行为一致。
+ */
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping("/api/tasks")
+@Tag(name = "任务重试", description = "失败任务在原任务上复位重试(外观专利/相似ASIN/采集数据共用)。")
+public class TaskRetryController {
+
+ private final TaskInPlaceRetryService taskRetryService;
+ private final AdminAuthSupport adminAuthSupport;
+
+ @PostMapping("/{taskId}/retry")
+ @Operation(summary = "重试失败任务",
+ description = "在原任务上复位(FAILED→PENDING),保留分片/解析载荷/已检测标记,不创建新任务。")
+ public ApiResponse 外观专利/相似ASIN/采集数据三个模块的失败任务走同一条路——它们原先都会被
+ * {@code TaskResumeService} 克隆重试,同一份输入在界面上多出好几行。
+ */
+ public void retryFailedTask(Long taskId, Long userId) {
+ FileTaskEntity task = fileTaskMapper.selectById(taskId);
+ if (task == null || !java.util.Objects.equals(userId, task.getUserId())) {
+ throw new com.nanri.aiimage.common.exception.BusinessException("任务不存在");
+ }
+ retryFailedTask(taskId, userId, task.getModuleType());
+ }
+
/**
* 用户点「重试」的入口:校验归属与状态后原地复位。
*
diff --git a/frontend-vue/src/pages/brand/components/BrandCollectDataTab.vue b/frontend-vue/src/pages/brand/components/BrandCollectDataTab.vue
index 1d8e3d823..c91b21a9a 100644
--- a/frontend-vue/src/pages/brand/components/BrandCollectDataTab.vue
+++ b/frontend-vue/src/pages/brand/components/BrandCollectDataTab.vue
@@ -120,11 +120,15 @@
history-empty-text="暂无历史记录"
>
+
+
@@ -139,6 +143,7 @@
import { computed, onBeforeUnmount, onMounted, reactive, ref, shallowRef, triggerRef } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from 'element-plus'
+import { retryClientTask } from '@/shared/api/task-retry'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import FileUploadZone from '@/shared/components/FileUploadZone.vue'
import ModuleTemplateDownload from '@/shared/components/ModuleTemplateDownload.vue'
@@ -491,6 +496,26 @@ async function pushToPythonQueue() {
}
}
+/**
+ * 失败任务重试:在**原任务**上复位续跑(不新建任务),与外观专利同口径。
+ * 只有 FAILED 才出按钮——成功/进行中的任务重试没有语义。
+ */
+function canRetryTask(item: CollectDataHistoryItem | null | undefined): boolean {
+ return Boolean(item?.taskId) && normalizeTaskStatus(item as CollectDataHistoryItem) === 'FAILED'
+}
+
+async function retryTaskRecord(item: CollectDataHistoryItem | null | undefined) {
+ const taskId = item?.taskId
+ if (!taskId) return
+ try {
+ await retryClientTask(taskId)
+ ElMessage.success('已提交重试:在这条任务上继续跑(不新建任务)')
+ await refreshBoard()
+ } catch (error) {
+ ElMessage.error(error instanceof Error ? error.message : '重试失败')
+ }
+}
+
function normalizeTaskStatus(item: CollectDataHistoryItem) {
return (item.taskStatus || '').toUpperCase()
}
diff --git a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue
index 12fd4d900..89e3133b3 100644
--- a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue
+++ b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue
@@ -109,11 +109,15 @@