From 45d0989ada4b8ad76eb460f1a217c092b4d37e69 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, 15 Nov 2026 01:56:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(jd-collect):=20=E4=BB=BB=E5=8A=A1=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E6=94=B9=E7=89=88=E2=80=94=E2=80=94=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=20dashboard/history/progress-batch/delete=20=E5=9B=9B=E7=AB=AF?= =?UTF-8?q?=E7=82=B9=EF=BC=8B=E5=89=8D=E7=AB=AF=E5=B7=A6=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=8F=B3=20TaskCenterPanel=EF=BC=88=E5=8E=86=E5=8F=B2/?= =?UTF-8?q?=E6=96=AD=E7=82=B9=E7=BB=AD=E4=BC=A0/=E4=B8=AD=E6=96=AD/?= =?UTF-8?q?=E9=87=8D=E8=AF=95=E8=B5=B0=E9=80=9A=E7=94=A8=E5=8E=9F=E4=BD=8D?= =?UTF-8?q?=E5=A4=8D=E4=BD=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jd/controller/JdCollectController.java | 59 ++ .../model/dto/JdCollectTaskBatchRequest.java | 24 + .../jd/model/vo/JdCollectDashboardVo.java | 28 + .../jd/model/vo/JdCollectHistoryItemVo.java | 71 +++ .../jd/model/vo/JdCollectHistoryVo.java | 16 + .../jd/model/vo/JdCollectTaskBatchVo.java | 19 + .../jd/model/vo/JdCollectTaskDetailVo.java | 22 + .../jd/model/vo/JdCollectTaskItemVo.java | 25 + .../jd/service/JdCollectBoardService.java | 306 +++++++++++ .../jd/service/JdCollectTaskService.java | 63 +-- .../jd/service/JdScopeStateReader.java | 63 +++ .../jd/service/JdCollectBoardServiceTest.java | 194 +++++++ frontend-vue/src/pages/jd/JdCollectTab.vue | 509 ++++++++++-------- frontend-vue/src/shared/api/endpoints.ts | 8 + .../shared/api/types/modules/jd-collect.ts | 202 ++++++- .../tests/catch-silence-ratchet.test.ts | 6 +- frontend-vue/tests/endpoints.test.ts | 13 +- frontend-vue/tests/jd-collect-tab.test.ts | 9 +- .../tests/jd-console-tool-catalog.test.ts | 12 +- .../mount/jd-collect-progress.mount.test.ts | 222 +++++--- .../task-terminal-set-single-source.test.ts | 1 + 21 files changed, 1494 insertions(+), 378 deletions(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdCollectTaskBatchRequest.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectDashboardVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectHistoryItemVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectHistoryVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectTaskBatchVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectTaskDetailVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectTaskItemVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdCollectBoardService.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdScopeStateReader.java create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdCollectBoardServiceTest.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java index 3317b3889..bbee98acc 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java @@ -1,18 +1,25 @@ package com.nanri.aiimage.modules.jd.controller; import com.nanri.aiimage.common.api.ApiResponse; +import com.nanri.aiimage.common.api.PageDefaults; import com.nanri.aiimage.common.security.AdminAuthSupport; +import com.nanri.aiimage.modules.jd.model.dto.JdCollectTaskBatchRequest; import com.nanri.aiimage.modules.jd.model.dto.JdCollectTaskCreateRequest; import com.nanri.aiimage.modules.jd.model.dto.JdIngestChunkRequest; +import com.nanri.aiimage.modules.jd.model.vo.JdCollectDashboardVo; +import com.nanri.aiimage.modules.jd.model.vo.JdCollectHistoryVo; import com.nanri.aiimage.modules.jd.model.vo.JdCollectProgressVo; +import com.nanri.aiimage.modules.jd.model.vo.JdCollectTaskBatchVo; import com.nanri.aiimage.modules.jd.model.vo.JdCollectTaskVo; import com.nanri.aiimage.modules.jd.model.vo.JdIngestChunkVo; +import com.nanri.aiimage.modules.jd.service.JdCollectBoardService; import com.nanri.aiimage.modules.jd.service.JdCollectTaskService; import com.nanri.aiimage.modules.jd.service.JdResultIngestService; import com.nanri.aiimage.modules.task.model.dto.TaskHeartbeatRequest; import com.nanri.aiimage.modules.task.model.vo.TaskHeartbeatVo; import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService; import com.nanri.aiimage.modules.task.service.TaskHeartbeatService; +import com.nanri.aiimage.modules.task.service.TaskProgressOwnershipSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -20,6 +27,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -45,11 +53,62 @@ import org.springframework.web.bind.annotation.RestController; public class JdCollectController { private final JdCollectTaskService collectTaskService; + private final JdCollectBoardService boardService; private final JdResultIngestService ingestService; private final TaskHeartbeatService taskHeartbeatService; private final TaskHeartbeatPositionService taskHeartbeatPositionService; + private final TaskProgressOwnershipSupport progressOwnershipSupport; private final AdminAuthSupport adminAuthSupport; + @GetMapping("/dashboard") + @Operation(summary = "查询京东采集任务总览", description = "当前用户的运行中、成功、失败任务数。" + + "任务面板统计卡数据源,页面进入时请求一次即可,不需要持续轮询。") + public ApiResponse dashboard( + @Parameter(description = "当前用户 ID", required = true, example = "1") + @RequestParam("user_id") Long userId, + HttpServletRequest httpRequest) { + userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId); + return ApiResponse.success(boardService.dashboard(userId)); + } + + @GetMapping("/history") + @Operation(summary = "查询京东采集任务历史", description = "当前用户最近的任务历史(活跃任务排前)," + + "含店铺名、任务状态、已落商品行数、断点游标与终态原因。任务面板历史层数据源。") + public ApiResponse history( + @Parameter(description = "当前用户 ID", required = true, example = "1") + @RequestParam("user_id") Long userId, + @Parameter(description = "历史记录条数,默认 50,最大 100", example = "50") + @RequestParam(value = "limit", required = false, defaultValue = PageDefaults.DEFAULT_RESULT_LIMIT) Integer limit, + HttpServletRequest httpRequest) { + userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId); + int safeLimit = limit == null ? 100 : Math.min(Math.max(1, limit), 100); + return ApiResponse.success(boardService.history(userId, safeLimit)); + } + + @PostMapping("/tasks/progress/batch") + @Operation(summary = "批量查询任务进度", description = "任务面板只对活跃任务调用该接口,建议 6 秒一次。" + + "归属先由公共出口按会话身份过滤,返回任务头 + 最新游标进度。") + public ApiResponse progressBatch(@Valid @RequestBody JdCollectTaskBatchRequest request, + HttpServletRequest httpRequest) { + return ApiResponse.success(boardService.progressBatch(progressOwnershipSupport + .filterOwnedTaskIds(request.getTaskIds(), + adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())))); + } + + @DeleteMapping("/tasks/{taskId}") + @Operation(summary = "删除任务", description = "删除当前用户的一条京东采集任务,同时清理京东数据库" + + "该任务落下的商品/图片/SKU 行与断点游标(铁律 32 数据面)。") + public ApiResponse deleteTask( + @Parameter(description = "任务 ID", required = true, example = "34398") + @PathVariable Long taskId, + @Parameter(description = "当前用户 ID,必须与创建任务的用户一致", required = true, example = "1") + @RequestParam("user_id") Long userId, + HttpServletRequest httpRequest) { + userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId); + boardService.deleteTask(taskId, userId); + return ApiResponse.success(null); + } + @PostMapping("/tasks") @Operation(summary = "创建京东店铺采集任务", description = "选择店铺 + 商品 Tab(在售/已下架)+ 采集范围建单;" + "任务落 PENDING、执行通道显式 LOCAL(本机紫鸟执行)。返回 taskId/taskNo/collectChannel。") diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdCollectTaskBatchRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdCollectTaskBatchRequest.java new file mode 100644 index 000000000..b27c74c6f --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdCollectTaskBatchRequest.java @@ -0,0 +1,24 @@ +package com.nanri.aiimage.modules.jd.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +import java.util.List; + +/** + * 京东采集批量进度请求(形状照 {@code AppearancePatentTaskBatchRequest})。 + * {@code userId} 可省略:归属过滤主体是 {@code TaskProgressOwnershipSupport.filterOwnedTaskIds} + * 按会话身份判定,请求体里的 userId 只作 admin 代客的归属提示。 + */ +@Data +@Schema(description = "京东采集批量进度请求") +public class JdCollectTaskBatchRequest { + + @Schema(description = "要查询的任务 ID 列表(只查活跃任务,建议 6 秒一批)", required = true) + @NotEmpty(message = "taskIds 不能为空") + private List taskIds; + + @Schema(description = "当前用户 ID(归属过滤用,可省略)") + private Long userId; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectDashboardVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectDashboardVo.java new file mode 100644 index 000000000..40b221d0e --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectDashboardVo.java @@ -0,0 +1,28 @@ +package com.nanri.aiimage.modules.jd.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 京东采集任务面板总览(v1.5 用户端「任务中心」统计卡数据源)。 + * + *

形状照外观专利 {@code AppearancePatentDashboardVo}:四张卡各一个数, + * {@code pendingTaskCount} 实际存 RUNNING 数(页面文案「运行中任务」), + * {@code processedTaskCount} = 成功 + 失败。页面进入时请求一次即可,不需要持续轮询。 + */ +@Data +@Schema(description = "京东采集任务总览:运行中/已结束/成功/失败任务数") +public class JdCollectDashboardVo { + + @Schema(description = "运行中任务数(RUNNING)", example = "1") + private Long pendingTaskCount; + + @Schema(description = "已结束任务数(成功+失败)", example = "5") + private Long processedTaskCount; + + @Schema(description = "成功任务数", example = "4") + private Long successTaskCount; + + @Schema(description = "失败任务数", example = "1") + private Long failedTaskCount; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectHistoryItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectHistoryItemVo.java new file mode 100644 index 000000000..cee962e84 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectHistoryItemVo.java @@ -0,0 +1,71 @@ +package com.nanri.aiimage.modules.jd.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * 京东采集历史行(v1.5 用户端「任务中心」卡片数据源)。 + * + *

形状照外观专利 {@code AppearancePatentHistoryItemVo} 裁剪:京东采集没有 + * {@code biz_file_result}/{@code biz_task_file_job}(交付物直接落京东数据库,无结果文件), + * 所以没有 downloadUrl/fileStatus/fileProgress 那一层;行数与游标改从 + * {@code biz_jd_product} 计数与 {@code biz_task_scope_state} 取。时间一律 ISO 字符串 + * ({@code LocalDateTime.toString()}),与外观专利前端格式化口径一致。 + */ +@Data +@Schema(description = "京东采集历史行:任务状态 + 行数 + 游标进度 + 终态原因") +public class JdCollectHistoryItemVo { + + @Schema(description = "结果记录 ID(京东采集无结果文件,恒空)") + private Long resultId; + + @Schema(description = "任务 ID", example = "34398") + private Long taskId; + + @Schema(description = "任务号", example = "JD_SHOP_COLLECT-1973...") + private String taskNo; + + @Schema(description = "任务状态(biz_file_task.status 原值:PENDING/RUNNING/SUCCESS/FAILED)") + private String taskStatus; + + @Schema(description = "任务是否成功结束") + private Boolean success; + + @Schema(description = "终态原因(FAILED 时为客户端上报的真实原因)") + private String errorMessage; + + @Schema(description = "建单时选择的店铺名(建单载荷 shopName)", example = "花屿巷旗舰店") + private String shopName; + + @Schema(description = "建单时选择的商品 Tab(ONSALE/OFFSALE)") + private List listTabs; + + @Schema(description = "已落京东数据库的商品行数(biz_jd_product 按 task_id 计数)", example = "1407") + private Integer rowCount; + + @Schema(description = "已回传商品数(scope 游标 itemsReceived)", example = "1407") + private Integer itemsReceived; + + @Schema(description = "列表总数(客户端抓首页时写入游标,没拿到过为空)") + private Integer total; + + @Schema(description = "当前采集页(断点游标)") + private Integer page; + + @Schema(description = "当前采集 Tab(ONSALE/OFFSALE)") + private String listTab; + + @Schema(description = "已收到的分片批次数") + private Integer batches; + + @Schema(description = "最近一次回传/合并写时间(ISO)") + private String updatedAt; + + @Schema(description = "建单时间(ISO)") + private String createdAt; + + @Schema(description = "结束时间(ISO)") + private String finishedAt; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectHistoryVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectHistoryVo.java new file mode 100644 index 000000000..5cfd9136d --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectHistoryVo.java @@ -0,0 +1,16 @@ +package com.nanri.aiimage.modules.jd.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** 京东采集历史列表(形状照 {@code AppearancePatentHistoryVo})。 */ +@Data +@Schema(description = "京东采集历史列表") +public class JdCollectHistoryVo { + + @Schema(description = "历史行(活跃任务排前,其余按最近回传时间倒序)") + private List items = new ArrayList<>(); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectTaskBatchVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectTaskBatchVo.java new file mode 100644 index 000000000..884ddd844 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectTaskBatchVo.java @@ -0,0 +1,19 @@ +package com.nanri.aiimage.modules.jd.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** 京东采集批量进度响应(形状照 {@code AppearancePatentTaskBatchVo})。 */ +@Data +@Schema(description = "京东采集批量进度:items + 查不到的任务 ID") +public class JdCollectTaskBatchVo { + + @Schema(description = "命中的任务条目") + private List items = new ArrayList<>(); + + @Schema(description = "归属校验后被剔除或不存在/不属于本模块的任务 ID") + private List missingTaskIds = new ArrayList<>(); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectTaskDetailVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectTaskDetailVo.java new file mode 100644 index 000000000..6e365a10e --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectTaskDetailVo.java @@ -0,0 +1,22 @@ +package com.nanri.aiimage.modules.jd.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * 京东采集批量进度条目(形状照 {@code AppearancePatentTaskDetailVo}: + * {@code task} 任务头 + {@code items} 单元素历史行,前端任务面板按同一形状消费)。 + */ +@Data +@Schema(description = "京东采集批量进度条目:任务头 + 最新进度") +public class JdCollectTaskDetailVo { + + @Schema(description = "任务头") + private JdCollectTaskItemVo task; + + @Schema(description = "进度行(单元素,取该任务最新一条历史形状)") + private List items = new ArrayList<>(); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectTaskItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectTaskItemVo.java new file mode 100644 index 000000000..7d9a9aa6c --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdCollectTaskItemVo.java @@ -0,0 +1,25 @@ +package com.nanri.aiimage.modules.jd.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** 京东采集批量进度里的任务头(形状照 {@code AppearancePatentTaskItemVo})。 */ +@Data +@Schema(description = "京东采集任务头(批量进度用)") +public class JdCollectTaskItemVo { + + @Schema(description = "任务 ID", example = "34398") + private Long id; + + @Schema(description = "任务号") + private String taskNo; + + @Schema(description = "任务状态(biz_file_task.status 原值)") + private String status; + + @Schema(description = "终态原因") + private String errorMessage; + + @Schema(description = "最近更新时间(ISO)") + private String updatedAt; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdCollectBoardService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdCollectBoardService.java new file mode 100644 index 000000000..43cfd7522 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdCollectBoardService.java @@ -0,0 +1,306 @@ +package com.nanri.aiimage.modules.jd.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.common.task.TaskStatuses; +import com.nanri.aiimage.modules.jd.mapper.JdProductImageMapper; +import com.nanri.aiimage.modules.jd.mapper.JdProductMapper; +import com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper; +import com.nanri.aiimage.modules.jd.model.dto.JdCollectTaskCreateRequest; +import com.nanri.aiimage.modules.jd.model.vo.JdCollectDashboardVo; +import com.nanri.aiimage.modules.jd.model.vo.JdCollectHistoryItemVo; +import com.nanri.aiimage.modules.jd.model.vo.JdCollectHistoryVo; +import com.nanri.aiimage.modules.jd.model.vo.JdCollectTaskBatchVo; +import com.nanri.aiimage.modules.jd.model.vo.JdCollectTaskDetailVo; +import com.nanri.aiimage.modules.jd.model.vo.JdCollectTaskItemVo; +import com.nanri.aiimage.modules.jd.model.entity.JdProductEntity; +import com.nanri.aiimage.modules.jd.model.entity.JdProductImageEntity; +import com.nanri.aiimage.modules.jd.model.entity.JdProductSkuEntity; +import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; +import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper; +import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; +import com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; + +/** + * 京东采集任务面板服务(v1.5 用户端「任务中心」:总览/历史/批量进度/删除)。 + * + *

形状照外观专利的 {@code AppearancePatentProgressSupport}+{@code AppearancePatentTaskRecordSupport} + * 裁剪:京东采集没有 {@code biz_file_result}/{@code biz_task_file_job}(交付物直接落 + * 京东数据库,无结果文件、无下载),所以历史行的「行数」改从 {@code biz_jd_product} 按 + * {@code task_id} 计数、进度从 {@code biz_task_scope_state} 游标取;删除面清理 + * {@code biz_jd_product(_image/_sku)}+scope 行+任务主行(铁律 32 数据面)。 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class JdCollectBoardService { + + private static final int MAX_HISTORY_LIMIT = 100; + + private final FileTaskMapper fileTaskMapper; + private final TaskScopeStateMapper taskScopeStateMapper; + private final JdProductMapper jdProductMapper; + private final JdProductImageMapper jdProductImageMapper; + private final JdProductSkuMapper jdProductSkuMapper; + private final ObjectMapper objectMapper; + + /** 查询当前用户的面板总览(运行中/成功/失败三档计数,已结束=成功+失败)。 */ + public JdCollectDashboardVo dashboard(Long userId) { + JdCollectDashboardVo vo = new JdCollectDashboardVo(); + long running = countTask(userId, TaskStatuses.FileTask.RUNNING); + long success = countTask(userId, TaskStatuses.FileTask.SUCCESS); + long failed = countTask(userId, TaskStatuses.FileTask.FAILED); + vo.setPendingTaskCount(running); + vo.setSuccessTaskCount(success); + vo.setFailedTaskCount(failed); + vo.setProcessedTaskCount(success + failed); + return vo; + } + + private long countTask(Long userId, String status) { + return fileTaskMapper.selectCount(new LambdaQueryWrapper() + .eq(FileTaskEntity::getModuleType, JdCollectTaskService.MODULE_TYPE) + .eq(FileTaskEntity::getUserId, userId) + .eq(FileTaskEntity::getStatus, status)); + } + + /** + * 查询当前用户最近的任务历史(活跃任务排前,其余按最近回传时间倒序)。 + * 行数与游标批量回查(每任务一次聚合查询会打爆历史面板,100 行上限 × 2 条批量 SQL)。 + */ + public JdCollectHistoryVo history(Long userId, Integer limit) { + int safeLimit = Math.max(1, Math.min(limit == null ? 50 : limit, MAX_HISTORY_LIMIT)); + List tasks = fileTaskMapper.selectList(new LambdaQueryWrapper() + .eq(FileTaskEntity::getModuleType, JdCollectTaskService.MODULE_TYPE) + .eq(FileTaskEntity::getUserId, userId) + .orderByDesc(FileTaskEntity::getCreatedAt) + .last("limit " + safeLimit)); + tasks.sort(Comparator + .comparing((FileTaskEntity task) -> !isActive(task)) + .thenComparing(FileTaskEntity::getUpdatedAt, + Comparator.nullsLast(Comparator.reverseOrder())) + .thenComparing(FileTaskEntity::getId, Comparator.reverseOrder())); + + List taskIds = tasks.stream().map(FileTaskEntity::getId).toList(); + Map rowCounts = countProductsByTask(taskIds); + Map scopes = findScopeRows(taskIds); + + JdCollectHistoryVo vo = new JdCollectHistoryVo(); + for (FileTaskEntity task : tasks) { + vo.getItems().add(toHistoryItem(task, rowCounts.get(task.getId()), + scopes.get(task.getId()))); + } + return vo; + } + + private static boolean isActive(FileTaskEntity task) { + return TaskStatuses.FileTask.ACTIVE.contains(task.getStatus()); + } + + /** 批量数行:一条 GROUP BY 出全部任务的商品行数(Mapper 层聚合,Java 不逐行数)。 */ + private Map countProductsByTask(List taskIds) { + Map counts = new HashMap<>(); + if (taskIds.isEmpty()) { + return counts; + } + List> rows = jdProductMapper.selectMaps(new QueryWrapper() + .select("task_id", "count(*) as cnt") + .in("task_id", taskIds) + .groupBy("task_id")); + for (Map row : rows) { + Long taskId = JdScopeStateReader.asNullableInt(row.get("task_id")) == null + ? null : Long.valueOf(String.valueOf(row.get("task_id"))); + if (taskId != null) { + counts.put(taskId, JdScopeStateReader.asInt(row.get("cnt"))); + } + } + return counts; + } + + private Map findScopeRows(List taskIds) { + Map scopes = new HashMap<>(); + if (taskIds.isEmpty()) { + return scopes; + } + List rows = taskScopeStateMapper.selectList( + new LambdaQueryWrapper() + .eq(TaskScopeStateEntity::getModuleType, JdCollectTaskService.MODULE_TYPE) + .in(TaskScopeStateEntity::getTaskId, taskIds)); + for (TaskScopeStateEntity row : rows) { + scopes.putIfAbsent(row.getTaskId(), row); + } + return scopes; + } + + /** 组装历史行:任务头 + 建单载荷(店铺名/Tab,宽松读) + 行数 + 游标进度。 */ + private JdCollectHistoryItemVo toHistoryItem(FileTaskEntity task, Integer rowCount, + TaskScopeStateEntity scope) { + JdCollectHistoryItemVo item = new JdCollectHistoryItemVo(); + item.setTaskId(task.getId()); + item.setTaskNo(task.getTaskNo()); + item.setTaskStatus(task.getStatus()); + item.setSuccess(TaskStatuses.FileTask.SUCCESS.equals(task.getStatus())); + item.setErrorMessage(task.getErrorMessage()); + JdCollectTaskCreateRequest request = readCreateRequestQuiet(task); + if (request != null) { + item.setShopName(request.getShopName()); + item.setListTabs(request.getListTabs()); + } + item.setRowCount(rowCount == null ? 0 : rowCount); + fillProgress(item, task, scope); + if (task.getCreatedAt() != null) { + item.setCreatedAt(task.getCreatedAt().toString()); + } + if (task.getFinishedAt() != null) { + item.setFinishedAt(task.getFinishedAt().toString()); + } + return item; + } + + /** 历史行宽松读建单载荷:载荷缺失/损坏时只少店铺名,不把历史面板打成红条。 */ + private JdCollectTaskCreateRequest readCreateRequestQuiet(FileTaskEntity task) { + if (task.getRequestJson() == null || task.getRequestJson().isBlank()) { + return null; + } + try { + return objectMapper.readValue(task.getRequestJson(), JdCollectTaskCreateRequest.class); + } catch (Exception ex) { + log.warn("[jd-collect] 建单载荷解析失败,历史行少店铺名 taskId={} err={}", + task.getId(), ex.getMessage()); + return null; + } + } + + /** + * 填游标进度(与 {@code JdCollectTaskService#queryProgress} 同口径:任务行+scope 行两处真源, + * itemsReceived 取两源较大值,total/page 没拿到过为空)。 + */ + private void fillProgress(JdCollectHistoryItemVo item, FileTaskEntity task, + TaskScopeStateEntity scope) { + item.setItemsReceived(JdScopeStateReader.nz(task.getSuccessFileCount())); + item.setBatches(0); + if (scope != null) { + Map state = JdScopeStateReader.parse(objectMapper, scope.getStateJson(), + message -> log.warn("[jd-collect] {}", message)); + Map cursor = JdScopeStateReader.asMap(state.get("cursor")); + item.setItemsReceived(Math.max(JdScopeStateReader.nz(task.getSuccessFileCount()), + JdScopeStateReader.asInt(state.get("itemsReceived")))); + item.setTotal(JdScopeStateReader.asNullableInt(cursor.get("total"))); + item.setPage(JdScopeStateReader.asNullableInt(cursor.get("page"))); + Object tab = cursor.get("tab"); + item.setListTab(tab == null ? null : String.valueOf(tab)); + item.setBatches(scope.getReceivedChunkCount() == null ? 0 : scope.getReceivedChunkCount()); + } + if (scope != null && scope.getUpdatedAt() != null) { + item.setUpdatedAt(scope.getUpdatedAt().toString()); + } else if (task.getUpdatedAt() != null) { + item.setUpdatedAt(task.getUpdatedAt().toString()); + } + } + + /** + * 批量查任务进度(前端轮询专用,归属已由 {@code TaskProgressOwnershipSupport} 过滤)。 + * 形状照外观专利:每任务一条 {@code {task, items:[最新进度行]}},查不到的进 missingTaskIds。 + */ + public JdCollectTaskBatchVo progressBatch(List taskIds) { + Set normalized = new LinkedHashSet<>(); + if (taskIds != null) { + for (Long id : taskIds) { + if (id != null && id > 0) { + normalized.add(id); + } + } + } + JdCollectTaskBatchVo vo = new JdCollectTaskBatchVo(); + if (normalized.isEmpty()) { + return vo; + } + List tasks = fileTaskMapper.selectList( + new LambdaQueryWrapper().in(FileTaskEntity::getId, normalized)); + List hitIds = new ArrayList<>(); + for (FileTaskEntity task : tasks) { + if (!JdCollectTaskService.MODULE_TYPE.equals(task.getModuleType())) { + continue; + } + hitIds.add(task.getId()); + vo.getItems().add(toTaskDetail(task)); + } + for (Long id : normalized) { + if (!hitIds.contains(id)) { + vo.getMissingTaskIds().add(id); + } + } + return vo; + } + + private JdCollectTaskDetailVo toTaskDetail(FileTaskEntity task) { + JdCollectTaskItemVo taskItem = new JdCollectTaskItemVo(); + taskItem.setId(task.getId()); + taskItem.setTaskNo(task.getTaskNo()); + taskItem.setStatus(task.getStatus()); + taskItem.setErrorMessage(task.getErrorMessage()); + taskItem.setUpdatedAt(task.getUpdatedAt() == null ? null : task.getUpdatedAt().toString()); + + JdCollectTaskDetailVo detail = new JdCollectTaskDetailVo(); + detail.setTask(taskItem); + Map rowCounts = countProductsByTask(List.of(task.getId())); + detail.getItems().add(toHistoryItem(task, rowCounts.get(task.getId()), findScopeRow(task.getId()))); + return detail; + } + + private TaskScopeStateEntity findScopeRow(Long taskId) { + return taskScopeStateMapper.selectOne(new LambdaQueryWrapper() + .eq(TaskScopeStateEntity::getTaskId, taskId) + .eq(TaskScopeStateEntity::getModuleType, JdCollectTaskService.MODULE_TYPE) + .last("limit 1")); + } + + /** + * 删除任务(铁律 32 数据面):京东数据库三表按 {@code task_id} 清 + scope 行 + 任务主行。 + * 事务内只做 DB 删除;京东采集没有 OSS 载荷/任务缓存需要 afterCommit 清理。 + * 删行顺序照 {@code JdProductRowDeleteService#deleteRows}:先 sku/image 子行再主行。 + */ + @Transactional + public void deleteTask(Long taskId, Long userId) { + FileTaskEntity task = fileTaskMapper.selectById(taskId); + if (task == null || !JdCollectTaskService.MODULE_TYPE.equals(task.getModuleType()) + || (userId != null && task.getUserId() != null && !Objects.equals(userId, task.getUserId()))) { + throw new BusinessException("任务不存在"); + } + List productIds = jdProductMapper.selectList( + new LambdaQueryWrapper() + .select(JdProductEntity::getId) + .eq(JdProductEntity::getTaskId, taskId)) + .stream().map(JdProductEntity::getId).toList(); + if (!productIds.isEmpty()) { + jdProductSkuMapper.delete(new LambdaQueryWrapper() + .in(JdProductSkuEntity::getProductId, productIds)); + jdProductImageMapper.delete(new LambdaQueryWrapper() + .in(JdProductImageEntity::getProductId, productIds)); + } + int products = jdProductMapper.delete(new LambdaQueryWrapper() + .eq(JdProductEntity::getTaskId, taskId)); + taskScopeStateMapper.delete(new LambdaQueryWrapper() + .eq(TaskScopeStateEntity::getTaskId, taskId) + .eq(TaskScopeStateEntity::getModuleType, JdCollectTaskService.MODULE_TYPE)); + fileTaskMapper.deleteById(taskId); + log.info("[jd-collect] 删除任务 taskId={} userId={} 商品行={}", taskId, userId, products); + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdCollectTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdCollectTaskService.java index 10cb8ba58..8546682c2 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdCollectTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdCollectTaskService.java @@ -22,7 +22,6 @@ import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; import java.time.LocalDateTime; -import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; import java.util.Objects; @@ -234,15 +233,17 @@ public class JdCollectTaskService { if (scope == null) { // scope 行缺失(历史/异常建单)时只回任务级状态,进度按 0 计,不抛错—— // 进度查询是展示面,不该因为一行辅助表缺失把页面打成红条。 - vo.setItemsReceived(nz(task.getSuccessFileCount())); + vo.setItemsReceived(JdScopeStateReader.nz(task.getSuccessFileCount())); vo.setBatches(0); return vo; } - Map state = parseScopeState(scope.getStateJson()); - Map cursor = asMap(state.get("cursor")); - vo.setItemsReceived(Math.max(nz(task.getSuccessFileCount()), asInt(state.get("itemsReceived")))); - vo.setTotal(asNullableInt(cursor.get("total"))); - vo.setPage(asNullableInt(cursor.get("page"))); + Map state = JdScopeStateReader.parse(objectMapper, scope.getStateJson(), + message -> log.warn("[jd-collect] scope 状态 JSON 解析失败,进度按 0 展示 taskId 相关行: {}", message)); + Map cursor = JdScopeStateReader.asMap(state.get("cursor")); + vo.setItemsReceived(Math.max(JdScopeStateReader.nz(task.getSuccessFileCount()), + JdScopeStateReader.asInt(state.get("itemsReceived")))); + vo.setTotal(JdScopeStateReader.asNullableInt(cursor.get("total"))); + vo.setPage(JdScopeStateReader.asNullableInt(cursor.get("page"))); Object tab = cursor.get("tab"); vo.setListTab(tab == null ? null : String.valueOf(tab)); vo.setBatches(scope.getReceivedChunkCount() == null ? 0 : scope.getReceivedChunkCount()); @@ -251,52 +252,4 @@ public class JdCollectTaskService { } return vo; } - - /** 读 scope 状态 JSON;损坏时返回空对象并留痕(查询面不因一行脏 JSON 抛错)。 */ - private Map parseScopeState(String stateJson) { - if (stateJson == null || stateJson.isBlank()) { - return new LinkedHashMap<>(); - } - try { - Map parsed = objectMapper.readValue(stateJson, - objectMapper.getTypeFactory().constructMapType(LinkedHashMap.class, String.class, Object.class)); - return parsed == null ? new LinkedHashMap<>() : parsed; - } catch (Exception ex) { - log.warn("[jd-collect] scope 状态 JSON 解析失败,进度按 0 展示 taskId 相关行: {}", ex.getMessage()); - return new LinkedHashMap<>(); - } - } - - @SuppressWarnings("unchecked") - private static Map asMap(Object raw) { - return raw instanceof Map ? new LinkedHashMap<>((Map) raw) : new LinkedHashMap<>(); - } - - private static int asInt(Object raw) { - Integer value = asNullableInt(raw); - return value == null ? 0 : value; - } - - /** - * 宽松读整数:数字类型直接用,字符串只认 1~9 位十进制(int 范围内必然不溢出)。 - * 不拿 {@code NumberFormatException} 当控制流——脏值在进度展示面是正常的空结果, - * 不该为它添一个 catch(catch 棘轮同形判据)。 - */ - private static Integer asNullableInt(Object raw) { - if (raw instanceof Number number) { - return number.intValue(); - } - if (raw == null) { - return null; - } - String text = String.valueOf(raw).trim(); - if (!text.matches("-?\\d{1,9}")) { - return null; - } - return Integer.valueOf(text); - } - - private static int nz(Integer value) { - return value == null ? 0 : Math.max(0, value); - } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdScopeStateReader.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdScopeStateReader.java new file mode 100644 index 000000000..c0a9cb1d6 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdScopeStateReader.java @@ -0,0 +1,63 @@ +package com.nanri.aiimage.modules.jd.service; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * scope 状态 JSON 的宽松读取工具(进度/历史/批量进度三个展示面共用)。 + * + *

从 {@code JdCollectTaskService} 的私有小工具收口而来:展示面不因一行脏 JSON 抛错, + * 读不出的键一律按空值展示(不编造 0 以外的数)。解析只认 1~9 位十进制(int 范围内必然 + * 不溢出),不拿 {@code NumberFormatException} 当控制流——脏值在进度展示面是正常的空结果。 + */ +final class JdScopeStateReader { + + private JdScopeStateReader() { + } + + /** 读 scope 状态 JSON;损坏时返回空对象并留痕(调用方日志口径自定)。 */ + static Map parse(ObjectMapper objectMapper, String stateJson, + java.util.function.Consumer warn) { + if (stateJson == null || stateJson.isBlank()) { + return new LinkedHashMap<>(); + } + try { + Map parsed = objectMapper.readValue(stateJson, + objectMapper.getTypeFactory().constructMapType(LinkedHashMap.class, String.class, Object.class)); + return parsed == null ? new LinkedHashMap<>() : parsed; + } catch (Exception ex) { + warn.accept("scope 状态 JSON 解析失败,进度按 0 展示: " + ex.getMessage()); + return new LinkedHashMap<>(); + } + } + + @SuppressWarnings("unchecked") + static Map asMap(Object raw) { + return raw instanceof Map ? new LinkedHashMap<>((Map) raw) : new LinkedHashMap<>(); + } + + static int asInt(Object raw) { + Integer value = asNullableInt(raw); + return value == null ? 0 : value; + } + + static Integer asNullableInt(Object raw) { + if (raw instanceof Number number) { + return number.intValue(); + } + if (raw == null) { + return null; + } + String text = String.valueOf(raw).trim(); + if (!text.matches("-?\\d{1,9}")) { + return null; + } + return Integer.valueOf(text); + } + + static int nz(Integer value) { + return value == null ? 0 : Math.max(0, value); + } +} diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdCollectBoardServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdCollectBoardServiceTest.java new file mode 100644 index 000000000..a0b824ae9 --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdCollectBoardServiceTest.java @@ -0,0 +1,194 @@ +package com.nanri.aiimage.modules.jd.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.modules.jd.mapper.JdProductImageMapper; +import com.nanri.aiimage.modules.jd.mapper.JdProductMapper; +import com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper; +import com.nanri.aiimage.modules.jd.model.vo.JdCollectHistoryItemVo; +import com.nanri.aiimage.modules.jd.model.vo.JdCollectTaskBatchVo; +import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; +import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper; +import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; +import com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * 京东采集任务面板服务(v1.5 任务面板四端点)。 + * + *

判据四件:① 总览三档计数(已结束=成功+失败);② 历史行读真源(biz_jd_product 行数 + * + scope 游标),活跃任务排前;③ 批量进度按模块过滤,非本模块任务进 missingTaskIds + * 不冒充面板条目;④ 删除面校验归属后才清京东数据库三表+scope 行+任务主行(铁律 32)。 + */ +@ExtendWith(MockitoExtension.class) +class JdCollectBoardServiceTest { + + @Mock + private FileTaskMapper fileTaskMapper; + @Mock + private TaskScopeStateMapper taskScopeStateMapper; + @Mock + private JdProductMapper jdProductMapper; + @Mock + private JdProductImageMapper jdProductImageMapper; + @Mock + private JdProductSkuMapper jdProductSkuMapper; + @Spy + private ObjectMapper objectMapper = new ObjectMapper(); + + @InjectMocks + private JdCollectBoardService service; + + @org.junit.jupiter.api.BeforeEach + void setUp() { + // LambdaQueryWrapper 需要 MP 的 lambda cache(JdProductDeleteServiceTest 同款初始化)。 + com.baomidou.mybatisplus.core.MybatisConfiguration configuration = + new com.baomidou.mybatisplus.core.MybatisConfiguration(); + org.apache.ibatis.builder.MapperBuilderAssistant assistant = + new org.apache.ibatis.builder.MapperBuilderAssistant(configuration, ""); + com.baomidou.mybatisplus.core.metadata.TableInfoHelper.initTableInfo(assistant, + com.nanri.aiimage.modules.jd.model.entity.JdProductEntity.class); + com.baomidou.mybatisplus.core.metadata.TableInfoHelper.initTableInfo(assistant, + com.nanri.aiimage.modules.jd.model.entity.JdProductImageEntity.class); + com.baomidou.mybatisplus.core.metadata.TableInfoHelper.initTableInfo(assistant, + com.nanri.aiimage.modules.jd.model.entity.JdProductSkuEntity.class); + com.baomidou.mybatisplus.core.metadata.TableInfoHelper.initTableInfo(assistant, + com.nanri.aiimage.modules.task.model.entity.FileTaskEntity.class); + com.baomidou.mybatisplus.core.metadata.TableInfoHelper.initTableInfo(assistant, + com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity.class); + } + + private FileTaskEntity task(long id, long userId, String status) { + FileTaskEntity task = new FileTaskEntity(); + task.setId(id); + task.setModuleType(JdCollectTaskService.MODULE_TYPE); + task.setUserId(userId); + task.setTaskNo("JD-" + id); + task.setStatus(status); + task.setSuccessFileCount(0); + task.setRequestJson("{\"userId\":" + userId + ",\"shopName\":\"花屿巷旗舰店\"," + + "\"listTabs\":[\"ONSALE\"],\"maxProducts\":0}"); + task.setCreatedAt(LocalDateTime.of(2026, 11, 15, 10, 0)); + task.setUpdatedAt(LocalDateTime.of(2026, 11, 15, 10, 1)); + return task; + } + + private TaskScopeStateEntity scope(long taskId, String stateJson, Integer batches) { + TaskScopeStateEntity scope = new TaskScopeStateEntity(); + scope.setTaskId(taskId); + scope.setModuleType(JdCollectTaskService.MODULE_TYPE); + scope.setStateJson(stateJson); + scope.setReceivedChunkCount(batches); + scope.setUpdatedAt(LocalDateTime.of(2026, 11, 15, 10, 2)); + return scope; + } + + @Test + void 总览三档计数与已结束数() { + when(fileTaskMapper.selectCount(any())).thenReturn(2L, 3L, 1L); + + var vo = service.dashboard(7L); + + assertThat(vo.getPendingTaskCount()).isEqualTo(2L); + assertThat(vo.getSuccessTaskCount()).isEqualTo(3L); + assertThat(vo.getFailedTaskCount()).isEqualTo(1L); + assertThat(vo.getProcessedTaskCount()).as("已结束=成功+失败").isEqualTo(4L); + } + + @Test + void 历史行读真源_行数来自京东数据库计数与游标进度() { + FileTaskEntity running = task(34398L, 7L, "RUNNING"); + FileTaskEntity failed = task(34400L, 7L, "FAILED"); + // selectList 先出 history 主查询(按 createdAt 倒序 limit),乱序返回验证排序 + when(fileTaskMapper.selectList(any())).thenReturn(new java.util.ArrayList<>(List.of(failed, running))); + when(jdProductMapper.selectMaps(any())).thenReturn(List.of( + Map.of("task_id", 34398L, "cnt", 120L), + Map.of("task_id", 34400L, "cnt", 88L))); + when(taskScopeStateMapper.selectList(any())).thenReturn(List.of( + scope(34398L, "{\"cursor\":{\"total\":300,\"page\":3},\"itemsReceived\":120}", 4), + scope(34400L, "{\"cursor\":{},\"itemsReceived\":88}", 3))); + + var vo = service.history(7L, 50); + + assertThat(vo.getItems()).hasSize(2); + // 活跃(RUNNING)排前:失败任务往后靠 + assertThat(vo.getItems().get(0).getTaskId()).isEqualTo(34398L); + JdCollectHistoryItemVo first = vo.getItems().get(0); + assertThat(first.getShopName()).as("店铺名来自建单载荷").isEqualTo("花屿巷旗舰店"); + assertThat(first.getRowCount()).as("行数只来自 biz_jd_product 计数").isEqualTo(120); + assertThat(first.getItemsReceived()).isEqualTo(120); + assertThat(first.getTotal()).isEqualTo(300); + assertThat(first.getPage()).isEqualTo(3); + assertThat(first.getBatches()).isEqualTo(4); + assertThat(vo.getItems().get(1).getTaskStatus()).isEqualTo("FAILED"); + } + + @Test + void 批量进度按模块过滤_非本模块任务进missingTaskIds() { + FileTaskEntity jd = task(88L, 7L, "RUNNING"); + FileTaskEntity patent = task(89L, 7L, "RUNNING"); + patent.setModuleType("APPEARANCE_PATENT"); + when(fileTaskMapper.selectList(any())).thenReturn(List.of(jd, patent)); + when(jdProductMapper.selectMaps(any())).thenReturn(List.of(Map.of("task_id", 88L, "cnt", 5L))); + when(taskScopeStateMapper.selectOne(any())).thenReturn( + scope(88L, "{\"cursor\":{\"total\":10},\"itemsReceived\":5}", 1)); + + JdCollectTaskBatchVo vo = service.progressBatch(List.of(88L, 89L, 0L, 88L)); + + assertThat(vo.getItems()).hasSize(1); + assertThat(vo.getItems().get(0).getTask().getId()).isEqualTo(88L); + assertThat(vo.getItems().get(0).getItems().get(0).getRowCount()).isEqualTo(5); + assertThat(vo.getMissingTaskIds()) + .as("非本模块任务不冒充面板条目;非法/重复 id 归一化后不影响") + .containsExactly(89L); + } + + @Test + void 删除任务_归属不符一律拒_不碰京东数据库() { + FileTaskEntity other = task(88L, 9L, "FAILED"); + when(fileTaskMapper.selectById(88L)).thenReturn(other); + + assertThatThrownBy(() -> service.deleteTask(88L, 7L)) + .isInstanceOf(BusinessException.class) + .hasMessageContaining("任务不存在"); + verify(jdProductMapper, never()).delete(any()); + verify(fileTaskMapper, never()).deleteById(any(java.io.Serializable.class)); + } + + @Test + void 删除任务_先清子行再清主行_scope行与任务行一并收掉() { + FileTaskEntity mine = task(88L, 7L, "FAILED"); + when(fileTaskMapper.selectById(88L)).thenReturn(mine); + com.nanri.aiimage.modules.jd.model.entity.JdProductEntity product = + new com.nanri.aiimage.modules.jd.model.entity.JdProductEntity(); + product.setId(5001L); + when(jdProductMapper.selectList(any())).thenReturn(List.of(product)); + when(jdProductMapper.delete(any())).thenReturn(1); + + service.deleteTask(88L, 7L); + + // sku/image 子行 → 主行 → scope → 任务行,五次删除一次不落 + verify(jdProductSkuMapper, times(1)).delete(any()); + verify(jdProductImageMapper, times(1)).delete(any()); + verify(jdProductMapper, times(1)).delete(any()); + verify(taskScopeStateMapper, times(1)).delete(any()); + verify(fileTaskMapper, times(1)).deleteById(any(java.io.Serializable.class)); + } +} diff --git a/frontend-vue/src/pages/jd/JdCollectTab.vue b/frontend-vue/src/pages/jd/JdCollectTab.vue index 3859181be..49f920435 100644 --- a/frontend-vue/src/pages/jd/JdCollectTab.vue +++ b/frontend-vue/src/pages/jd/JdCollectTab.vue @@ -1,159 +1,237 @@ @@ -277,34 +361,49 @@ onBeforeUnmount(() => {

-
+
+ + +
+ + + + +
@@ -453,24 +552,30 @@ onBeforeUnmount(() => { line-height: 1.5; } +/* ===== 左按钮 + 右任务面板(照外观专利 Tab 布局)===== */ .jd-body { flex: 1 1 auto; min-height: 0; - overflow-y: auto; - padding: 4px 34px 40px; display: flex; - justify-content: center; - /* 卡片按内容高度收口:flex 默认 stretch 会把它拉到整屏,空白比内容还长 */ - align-items: flex-start; + align-items: stretch; + overflow: hidden; } -.collect-card { - width: 100%; - max-width: 720px; - padding: 26px 28px; - border: 1px solid #3e4a62; - border-radius: 12px; - background: #232a3b; +.left-panel { + width: 400px; + flex-shrink: 0; + padding: 20px; + overflow-y: auto; + border-right: 1px solid #3e4a62; +} + +.right-panel { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; + overflow-y: auto; + padding: 20px; } .collect-btn { @@ -505,76 +610,6 @@ onBeforeUnmount(() => { line-height: 1.7; } -/* ===== 进度条 ===== */ -.progress-block { - margin-top: 22px; - padding: 16px 18px; - border: 1px solid #3e4a62; - border-radius: 10px; - background: #1f2637; -} - -.progress-head { - display: flex; - align-items: center; - justify-content: space-between; - gap: 12px; - margin-bottom: 10px; -} - -.progress-status { - color: #f5f8fc; - font-size: 14px; - font-weight: 700; -} - -.progress-percent { - color: #ff8a80; - font-size: 14px; - font-weight: 700; -} - -.progress-track { - position: relative; - height: 12px; - overflow: hidden; - border-radius: 999px; - background: #11161f; - border: 1px solid #2a3344; -} - -.progress-fill { - height: 100%; - width: 0; - border-radius: 999px; - background: linear-gradient(90deg, #ff7a70, #e1251b); - transition: width 0.4s ease; -} - -/* 没有 total(客户端还没抓到列表首页)时走不定态:不编造百分比 */ -.progress-fill--indeterminate { - position: absolute; - top: 0; - left: 0; - width: 40%; - animation: jd-progress-indeterminate 1.2s ease-in-out infinite; -} - -@keyframes jd-progress-indeterminate { - 0% { - transform: translateX(-100%); - } - 100% { - transform: translateX(250%); - } -} - -.progress-meta { - margin-top: 10px; - color: #a0acbe; - font-size: 12px; -} - .feedback { margin: 16px 0 0; padding: 10px 12px; @@ -593,6 +628,13 @@ onBeforeUnmount(() => { color: #fca5a5; } +/* 行内动作按钮:与外观专利 Tab 同色系(中断琥珀/重试绿/删除红),钉死 12px 字号 */ +.btn-delete, .btn-retry, .btn-interrupt { border: none; cursor: pointer; border-radius: 6px; font-size: 12px; } +.download { padding: 6px 10px; color: #c8d2e2; background: rgba(52, 152, 219, .18); } +.btn-delete { padding: 6px 10px; color: #ff8f8f; background: rgba(231, 76, 60, .12); } +.btn-retry { padding: 6px 10px; color: #7fd1a0; background: rgba(39, 174, 96, .14); } +.btn-interrupt { padding: 6px 10px; color: #f0b35e; background: rgba(240, 179, 94, .12); } + @media (max-width: 1100px) { .tool-head { padding: 10px 16px; @@ -600,7 +642,18 @@ onBeforeUnmount(() => { } .jd-body { - padding: 4px 16px 24px; + flex-direction: column; + overflow-y: auto; + } + + .left-panel { + width: 100%; + border-right: none; + border-bottom: 1px solid #3e4a62; + } + + .right-panel { + padding: 16px; } } diff --git a/frontend-vue/src/shared/api/endpoints.ts b/frontend-vue/src/shared/api/endpoints.ts index c5fbda8e8..b7069f269 100644 --- a/frontend-vue/src/shared/api/endpoints.ts +++ b/frontend-vue/src/shared/api/endpoints.ts @@ -213,6 +213,14 @@ export const API_ENDPOINTS = { progress: '/api/jd-collect/tasks/{taskId}/progress', heartbeat: '/api/jd-collect/tasks/{taskId}/heartbeat', chunk: '/api/jd-collect/tasks/{taskId}/chunk', + /** 任务面板总览(运行中/成功/失败计数统计卡) */ + dashboard: '/api/jd-collect/dashboard', + /** 任务历史(活跃任务排前,含行数与断点游标) */ + history: '/api/jd-collect/history', + /** 批量任务进度(面板轮询专用,归属先经公共出口过滤) */ + progressBatch: '/api/jd-collect/tasks/progress/batch', + /** 删除任务(连带清理京东数据库该任务的商品/图片/SKU 行与断点游标) */ + deleteTask: '/api/jd-collect/tasks/{taskId}', }, userSecret: { bundle: '/api/user-secrets', diff --git a/frontend-vue/src/shared/api/types/modules/jd-collect.ts b/frontend-vue/src/shared/api/types/modules/jd-collect.ts index 4ffc2525f..4b273a506 100644 --- a/frontend-vue/src/shared/api/types/modules/jd-collect.ts +++ b/frontend-vue/src/shared/api/types/modules/jd-collect.ts @@ -1,8 +1,9 @@ -import { get, post, type JavaApiResponse, unwrapJavaResponse } from '../../http.ts' -import { buildJavaUrl } from '../../url.ts' +import { get, post, del, type JavaApiResponse, unwrapJavaResponse } from '../../http.ts' +import { buildJavaUrl, JAVA_API_PREFIX } from '../../url.ts' import { getCurrentUserId } from '../../user.ts' import { API_ENDPOINTS } from '../../endpoints.ts' -import { getTaskProgressTimeoutMs } from '../../../task-progress-config.ts' +import { getTaskProgressCacheTtlMs, getTaskProgressTimeoutMs } from '../../../task-progress-config.ts' +import { createTaskProgressRequestCache } from '../../../task-progress-request-cache.ts' /** 京东店铺采集建单回执(蓝图 §3.2):任务落 PENDING、执行通道固定 LOCAL,由本机客户端领取执行。 */ export interface JdCollectTaskVo { @@ -28,13 +29,13 @@ export type JdListTab = 'ONSALE' | 'OFFSALE' export interface JdCollectProgressVo { taskId: number; status: string; - itemsReceived: number | null; - total: number | null; - page: number | null; - listTab: string | null; - batches: number | null; - message: string | null; - updatedAt: string | null; + itemsReceived?: number; + total?: number; + page?: number; + listTab?: string; + batches?: number; + message?: string; + updatedAt?: string; } /** 轮询采集进度:uid 与建单同口径(会话身份),任务 owner 不一致服务端直接拒。 */ @@ -76,3 +77,184 @@ export function createJdCollectTask(shopName: string, listTabs: JdListTab[], max }, )) } + +// --------------------------------------------------------------------------- +// 任务面板(v1.5):总览统计卡 / 历史层 / 活跃任务批量进度 / 删除任务。 +// 形状照外观专利 appearance-patent.ts 同名函数;京东采集没有结果文件, +// 所以没有 downloadUrl / fileStatus 那一层,进度直接用游标 itemsReceived/total。 +// --------------------------------------------------------------------------- + +/** 任务面板总览(运行中/已结束/成功/失败任务数)。 */ +export interface JdCollectDashboardVo { + pendingTaskCount: number; + processedTaskCount: number; + successTaskCount: number; + failedTaskCount: number; +} + +/** + * 历史行(任务卡片数据源)。`total` 为 null 时页面用不定态进度条, + * 与单任务进度条同口径(客户端抓过列表首页才写进游标,不编造分母)。 + */ +export interface JdCollectHistoryItemVo { + resultId?: number; + taskId?: number; + taskNo?: string; + /** biz_file_task.status 原值:PENDING/RUNNING/SUCCESS/FAILED */ + taskStatus?: string; + success?: boolean; + errorMessage?: string; + shopName?: string; + listTabs?: string[]; + /** 已落京东数据库的商品行数 */ + rowCount?: number; + itemsReceived?: number; + total?: number; + page?: number; + listTab?: string; + batches?: number; + updatedAt?: string; + createdAt?: string; + finishedAt?: string; +} + +export interface JdCollectHistoryVo { + items: JdCollectHistoryItemVo[]; +} + +/** 批量进度条目:任务头 + 单元素进度行(与外观专利 TaskDetailVo 同形)。 */ +export interface JdCollectTaskDetailVo { + task?: { + id?: number; + taskNo?: string; + status?: string; + errorMessage?: string; + updatedAt?: string; + }; + items?: JdCollectHistoryItemVo[]; +} + +export interface JdCollectTaskBatchVo { + items: JdCollectTaskDetailVo[]; + missingTaskIds: number[]; +} + +export function fetchJdCollectDashboard() { + return unwrapJavaResponse( + get>( + buildJavaUrl(API_ENDPOINTS.jdCollect.dashboard), + { params: { user_id: getCurrentUserId() } }, + ), + ); +} + +export function fetchJdCollectHistory() { + return unwrapJavaResponse( + get>( + buildJavaUrl(API_ENDPOINTS.jdCollect.history), + { params: { user_id: getCurrentUserId(), limit: 50 } }, + ), + ); +} + +interface JdProgressBatchOptions { + force?: boolean; +} + +const taskProgressResponseCache = createTaskProgressRequestCache({ + ttlMs: () => getTaskProgressCacheTtlMs(), + maxEntries: 100, + maxInflight: 16, +}); + +function normalizeTaskIds(taskIds: number[]) { + return Array.from( + new Set( + (taskIds || []) + .map((taskId) => Number(taskId)) + .filter((taskId) => Number.isFinite(taskId) && taskId > 0), + ), + ).sort((left, right) => left - right); +} + +function buildTaskProgressRequestKey(path: string, taskIds: number[]) { + return `${path}::${taskIds.join(',')}`; +} + +/** 批量进度请求缓存(与外观专利/delete-brand 同一形状:TTL 缓存 + 在飞合并 + force 旁路)。 */ +async function postTaskProgressBatch( + path: string, + taskIds: number[], + options: JdProgressBatchOptions = {}, +) { + const normalizedTaskIds = normalizeTaskIds(taskIds); + if (!normalizedTaskIds.length) { + return { items: [], missingTaskIds: [] } as T; + } + + const cacheKey = buildTaskProgressRequestKey(path, normalizedTaskIds); + const cached = taskProgressResponseCache.get(cacheKey); + if (!options.force && cached !== undefined) { + return cached as T; + } + + const inflight = taskProgressResponseCache.getInflight(cacheKey); + if (!options.force && inflight) { + return (await inflight) as T; + } + + const requestPromise = unwrapJavaResponse( + post, { taskIds: number[]; userId?: number }>(path, { + taskIds: normalizedTaskIds, + userId: Number(window.localStorage.getItem('uid')) || undefined, + }, { + timeout: getTaskProgressTimeoutMs(), + }), + ) + .then((data) => { + taskProgressResponseCache.set(cacheKey, data); + return data; + }) + .finally(() => { + taskProgressResponseCache.endInflight(cacheKey); + }); + + taskProgressResponseCache.startInflight(cacheKey, requestPromise); + return await requestPromise; +} + +export function fetchJdCollectTaskProgressBatch( + taskIds: number[], + options: JdProgressBatchOptions = {}, +) { + return postTaskProgressBatch( + buildJavaUrl(API_ENDPOINTS.jdCollect.progressBatch), + taskIds, + options, + ); +} + +/** 删除任务:服务端连带清理京东数据库该任务的商品/图片/SKU 行与断点游标。 */ +export function deleteJdCollectTask(taskId: number) { + return unwrapJavaResponse( + del>( + buildJavaUrl(API_ENDPOINTS.jdCollect.deleteTask.replace('{taskId}', String(taskId))), + { params: { user_id: getCurrentUserId() } }, + ), + ); +} + +/** + * 用户中断任务:在跑/待跑的任务落 CANCELLED——客户端心跳拿到 notAlive 后协作停止, + * 已采集的行保留在京东数据库(断点游标也在),之后可「继续」接着跑。 + * 终态任务重按是幂等 no-op;普通账号只能中断自己名下的任务。 + */ +export function interruptJdCollectTask(taskId: number) { + return unwrapJavaResponse( + post>( + `${JAVA_API_PREFIX}/tasks/${taskId}/interrupt`, + undefined, + { params: { user_id: getCurrentUserId() } }, + ), + ); +} diff --git a/frontend-vue/tests/catch-silence-ratchet.test.ts b/frontend-vue/tests/catch-silence-ratchet.test.ts index ef4a3c972..a47ae7749 100644 --- a/frontend-vue/tests/catch-silence-ratchet.test.ts +++ b/frontend-vue/tests/catch-silence-ratchet.test.ts @@ -79,7 +79,11 @@ const BASELINE = { // 原文只进 console,并由调用方写进 errorMessage 跳过推队列——错误既有可见出口也没被吞, // silent 一格没涨。**该笔提交当时改的是代码、没同步本基线**(8d8c88a5 树实扫 316 vs 台账 // 315 ⇒ 那一提交起本棘轮就是红的),此处按「逐条点名改基线」补记,不整份 --write 回写。 - blocks: 316, + // 317 = 316 + 1(2026-11-15 JdCollectTab 任务面板改版):旧页面的 pollProgress 轮询 + // catch 随单任务进度条移除(-1),新增 retryTaskRecord / interruptTaskRecord 两支 + // catch(+2)——重试失败/中断失败都走 ElMessage.error 把服务端文案报给用户, + // 原文只进 console;净 +1,silent 一格没涨(两支都不是静默形状)。 + blocks: 317, // 2026-10-30(ops Phase 6/可读棘轮):ApiSecretSettingsPanel.vue 1113→775 行,面板里那处 // 静默 catch(余额查询失败只 console.warn、界面留空)随 loadBalance 整块搬进 // useProxyPlan.ts。不是新增静默:面板 1→0、新文件记 1,silent 总数与 blocks 都一格没动, diff --git a/frontend-vue/tests/endpoints.test.ts b/frontend-vue/tests/endpoints.test.ts index 73c2caeb2..3585e39f3 100644 --- a/frontend-vue/tests/endpoints.test.ts +++ b/frontend-vue/tests/endpoints.test.ts @@ -89,6 +89,7 @@ test('test_progress_batch_paths_match_controllers', () => { '/api/query-asin/tasks/progress/batch', '/api/shop-data-crawl/tasks/progress/batch', '/api/withdraw/tasks/progress/batch', + '/api/jd-collect/tasks/progress/batch', ].sort(), 'progress/batch 端点应与 Java controller 路由一一对应', ) @@ -315,11 +316,21 @@ test('test_endpoints_frozen_snapshot', () => { // 2026-11-14 v1.4 京东数据库:三支端点(建单/心跳/分片回传)随 Phase 3 落码, // 冻结快照只许显式追加——端点漂移会让"新开一条匿名可达口"没人看见。 // 2026-11-14 v1.5:progress(进度条数据源,鉴权与建单同口径:uid 会话身份 + owner 校验)。 + // 2026-11-15 任务面板改版:dashboard/history/progressBatch(面板三件,鉴权照外观专利 + // ——dashboard/history/delete 走 resolve,progressBatch 走 filterOwnedTaskIds+require)+ + // deleteTask(连带清理京东数据库该任务的行与断点游标,铁律 32 数据面)。 "jdCollect": { "create": "/api/jd-collect/tasks", + // activate 补录(存量漂移):8d8c88a5「补激活这一步」只改了常量表,快照没跟上, + // 本次任务面板改版全量跑才暴露(快照测试此前没在全量档里红过)。 + "activate": "/api/jd-collect/tasks/{taskId}/activate", "progress": "/api/jd-collect/tasks/{taskId}/progress", "heartbeat": "/api/jd-collect/tasks/{taskId}/heartbeat", - "chunk": "/api/jd-collect/tasks/{taskId}/chunk" + "chunk": "/api/jd-collect/tasks/{taskId}/chunk", + "dashboard": "/api/jd-collect/dashboard", + "history": "/api/jd-collect/history", + "progressBatch": "/api/jd-collect/tasks/progress/batch", + "deleteTask": "/api/jd-collect/tasks/{taskId}" }, "userSecret": { "bundle": "/api/user-secrets", diff --git a/frontend-vue/tests/jd-collect-tab.test.ts b/frontend-vue/tests/jd-collect-tab.test.ts index bf3a71c72..c040dace0 100644 --- a/frontend-vue/tests/jd-collect-tab.test.ts +++ b/frontend-vue/tests/jd-collect-tab.test.ts @@ -40,13 +40,18 @@ test('endpoints 注册 jdCollect 端点组', () => { /** 2026-11-14 真机实录:建单请求体写成 `user_id` 时后端回一句「user_id 不合法」直接拒, * 管理员点「一键获取店铺数据」永远失败——Java 侧 DTO 是 camelCase `userId`(无 snake 命名 - * 策略),snake 键会被静默丢掉。进度接口的 `?user_id=` 是 @RequestParam,那个名字不改。 */ + * 策略),snake 键会被静默丢掉。进度接口的 `?user_id=` 是 @RequestParam,那个名字不改。 + * 射程只圈 createJdCollectTask 函数段:面板段的 `params: { user_id }` 是 @RequestParam + * 形状(deleteJdCollectTask 等与外观专利同形),不是请求体,不该被这条守卫误伤。 */ test('建单请求体用 camelCase userId,不是 user_id', () => { const api = readIfExists( join(process.cwd(), 'src', 'shared', 'api', 'types', 'modules', 'jd-collect.ts'), 'jd-collect.ts', ) - const body = api.slice(api.indexOf('createJdCollectTask')) + const start = api.indexOf('createJdCollectTask') + const end = api.indexOf('export interface JdCollectDashboardVo') + assert.ok(start > 0 && end > start, 'jd-collect.ts 缺 createJdCollectTask 或面板段形状变了') + const body = api.slice(start, end) assert.ok(/userId:\s*getCurrentUserId\(\)/.test(body), 'createJdCollectTask 请求体必须传 camelCase `userId`(传 user_id 会被后端丢掉⇒「user_id 不合法」)') assert.ok(!/[^_a-z]user_id:\s*getCurrentUserId\(\)/.test(body), diff --git a/frontend-vue/tests/jd-console-tool-catalog.test.ts b/frontend-vue/tests/jd-console-tool-catalog.test.ts index be57edc72..886d6f4bb 100644 --- a/frontend-vue/tests/jd-console-tool-catalog.test.ts +++ b/frontend-vue/tests/jd-console-tool-catalog.test.ts @@ -43,12 +43,14 @@ test('首页京东入口与亚马逊/视频并列', () => { assert.ok(/>京东 { +test('获取店铺数据页是一键触发 + 服务端进度(任务面板改版后)', () => { const page = read('src/pages/jd/JdCollectTab.vue') - assert.ok(page.includes('fetchJdCollectProgress'), '采集页必须轮询服务端进度(不拿本地内存数充进度)') - assert.ok(page.includes('progress-track'), '采集页缺进度条轨道') - assert.ok(page.includes('jd-progress-indeterminate'), - '拿不到 total 时必须走不定态进度条,不得编造百分比') + // 进度真源仍是服务端:改版后走批量进度轮询(useLiveTaskBoard),不再有单任务进度条 + assert.ok(page.includes('fetchJdCollectTaskProgressBatch'), + '采集页必须经 useLiveTaskBoard 轮询服务端批量进度(不拿本地内存数充进度)') + assert.ok(page.includes('file-progress') || page.includes('progress: showProgress'), + '采集页任务卡片必须带进度条(照外观专利面板形状)') assert.ok(page.includes('一键获取店铺数据'), '主按钮应是一键获取') assert.ok(page.includes('jd-shop-collect-run'), '建单后必须推送本机客户端队列') + assert.ok(page.includes('TaskCenterPanel'), '改版后右侧必须是共享任务面板(含历史任务层)') }) diff --git a/frontend-vue/tests/mount/jd-collect-progress.mount.test.ts b/frontend-vue/tests/mount/jd-collect-progress.mount.test.ts index c65ad85da..dd882ff09 100644 --- a/frontend-vue/tests/mount/jd-collect-progress.mount.test.ts +++ b/frontend-vue/tests/mount/jd-collect-progress.mount.test.ts @@ -1,12 +1,14 @@ /** - * 「获取店铺数据」一键采集 + 进度条挂载用例(v1.5)。 + * 「获取店铺数据」一键采集 + 任务面板挂载用例(v1.5 改版后)。 * - * 用户口径原话:「获取店铺就是点击获取后就自动抓已打开的京麦后台的店铺数据导入到后台 需要有进度条」。 - * 四组靶子,缺一条就是假绿: - * ① 点一次按钮就走完整链路:建单 → 把 `jd-shop-collect-run` 推进本机客户端队列; - * ② 有 total 时进度条按已落库商品数算出真实百分比(分母只来自服务端游标,不编造); - * ③ total 缺失时走不定态动画(没有分母就不许编一个假百分比); - * ④ 终态即收手:SUCCESS 落 100% + 导入完成文案,FAILED 用服务端原因,两种情况都不再轮询。 + * 页面改版(2026-11-15):左侧只留「一键获取店铺数据」按钮,右侧换共享任务面板 + * (TaskCenterPanel + useLiveTaskBoard,与外观专利同一骨架);单任务进度条移除, + * 进度在任务卡片上。四组靶子保留,缺一条就是假绿: + * ① 点一次按钮就走完整链路:建单 → 激活 → 把 `jd-shop-collect-run` 推进本机客户端队列 → 轮询批量进度; + * ② 有 total 时卡片进度条按已落库商品数算出真实百分比(分母只来自服务端游标,不编造); + * ③ total 缺失时只显示「已采集 N 个商品」,不编造百分比; + * ④ 终态即收手:SUCCESS/FAILED 从轮询移除,FAILED 显示服务端原因并出「重试」按钮 + * (重试走通用原位复位 + 重新激活推队列——断点续传,不新建任务)。 * * 跑法:`npx vitest run tests/mount/jd-collect-progress.mount.test.ts` */ @@ -20,38 +22,81 @@ const api = vi.hoisted(() => ({ // 8d8c88a5 起建单后先 PENDING→RUNNING 再推队列;mock 里缺这一个键会让组件拿到 // undefined 调用、enqueue 永远不被调用(本文件当时没跟上,红在这里)。 activateJdCollectTask: vi.fn(), - fetchJdCollectProgress: vi.fn(), + fetchJdCollectDashboard: vi.fn(), + fetchJdCollectHistory: vi.fn(), + fetchJdCollectTaskProgressBatch: vi.fn(), + deleteJdCollectTask: vi.fn(), + interruptJdCollectTask: vi.fn(), + retryClientTask: vi.fn(), enqueue: vi.fn(), })) vi.mock('@/shared/api/types/modules/jd-collect', () => ({ createJdCollectTask: api.createJdCollectTask, activateJdCollectTask: api.activateJdCollectTask, - fetchJdCollectProgress: api.fetchJdCollectProgress, + fetchJdCollectProgress: vi.fn(), + fetchJdCollectDashboard: api.fetchJdCollectDashboard, + fetchJdCollectHistory: api.fetchJdCollectHistory, + fetchJdCollectTaskProgressBatch: api.fetchJdCollectTaskProgressBatch, + deleteJdCollectTask: api.deleteJdCollectTask, + interruptJdCollectTask: api.interruptJdCollectTask, +})) +vi.mock('@/shared/api/task-retry', () => ({ + retryClientTask: api.retryClientTask, })) vi.mock('@/shared/bridges/pywebview', () => ({ getPywebviewApi: () => ({ enqueue_json: api.enqueue }), })) -const POLL_MS = 2000 +const EMPTY_DASHBOARD = { + pendingTaskCount: 0, + processedTaskCount: 0, + successTaskCount: 0, + failedTaskCount: 0, +} -let wrapper: VueWrapper | null = null - -function baseProgress(over: Record = {}) { +function historyItem(over: Record = {}) { return { taskId: 88, - status: 'RUNNING', + taskNo: 'JD-1', + taskStatus: 'RUNNING', + success: false, + errorMessage: null, + shopName: '花屿巷旗舰店', + listTabs: ['ONSALE', 'OFFSALE'], + rowCount: 30, itemsReceived: 30, total: 100, page: 2, listTab: 'ONSALE', batches: 1, - message: null, + createdAt: '2026-11-15T10:00:00', updatedAt: null, + finishedAt: null, ...over, } } +function batchOf(item: Record) { + return { + items: [ + { + task: { + id: item.taskId ?? 88, + taskNo: 'JD-1', + status: item.taskStatus ?? 'RUNNING', + errorMessage: item.errorMessage ?? null, + updatedAt: null, + }, + items: [item], + }, + ], + missingTaskIds: [], + } +} + +let wrapper: VueWrapper | null = null + async function mountPage() { wrapper = mount(JdCollectTab, { global: { @@ -74,13 +119,15 @@ async function startCollect(w: VueWrapper) { beforeEach(() => { vi.useFakeTimers() localStorage.setItem('username', 'admin') - api.createJdCollectTask.mockReset() - api.fetchJdCollectProgress.mockReset() - api.enqueue.mockReset() + for (const mock of Object.values(api)) mock.mockReset() api.createJdCollectTask.mockResolvedValue({ taskId: 88, taskNo: 'JD-1', collectChannel: 'LOCAL' }) - api.activateJdCollectTask.mockResolvedValue({ taskId: 88, status: 'RUNNING' }) + api.activateJdCollectTask.mockResolvedValue(null) api.enqueue.mockResolvedValue({ success: true }) + api.fetchJdCollectDashboard.mockResolvedValue(EMPTY_DASHBOARD) + api.fetchJdCollectHistory.mockResolvedValue({ items: [] }) + api.fetchJdCollectTaskProgressBatch.mockResolvedValue(batchOf(historyItem())) vi.spyOn(console, 'error').mockImplementation(() => {}) + vi.spyOn(console, 'warn').mockImplementation(() => {}) }) afterEach(() => { @@ -91,14 +138,13 @@ afterEach(() => { localStorage.clear() }) -describe('获取店铺数据:一键采集 + 进度条', () => { - it('点一次按钮就建单并把采集载荷推进本机客户端队列', async () => { - api.fetchJdCollectProgress.mockResolvedValue(baseProgress()) +describe('获取店铺数据:一键采集 + 任务面板', () => { + it('点一次按钮就走完整链路:建单 → 激活 → 推本机队列 → 轮询批量进度', async () => { const w = await mountPage() await startCollect(w) expect(api.createJdCollectTask).toHaveBeenCalledTimes(1) - // 店铺名留空 → 按「京麦后台」记录(与后端 shop_name 语义一致) + // 店铺名留空 → 按「京麦后台」占位(客户端从京麦后台现读真实店铺名落库) expect(api.createJdCollectTask).toHaveBeenCalledWith('京麦后台', ['ONSALE', 'OFFSALE'], 0) expect(api.activateJdCollectTask).toHaveBeenCalledWith(88) expect(api.enqueue).toHaveBeenCalledTimes(1) @@ -110,76 +156,102 @@ describe('获取店铺数据:一键采集 + 进度条', () => { listTabs: ['ONSALE', 'OFFSALE'], maxProducts: 0, }) + // 轮询已启动:批量进度端点拿到任务 88 + expect(api.fetchJdCollectTaskProgressBatch).toHaveBeenCalled() + const calledIds = api.fetchJdCollectTaskProgressBatch.mock.calls[0][0] + expect(calledIds).toContain(88) }) - it('有 total 时按已落库商品数显示真实百分比与进度元信息', async () => { - api.fetchJdCollectProgress.mockResolvedValue(baseProgress()) + it('有 total 时任务卡片显示真实百分比(分母只来自服务端游标)', async () => { const w = await mountPage() await startCollect(w) + await flushPromises() - expect(w.find('.progress-track').exists()).toBe(true) - expect(w.find('.progress-percent').text()).toBe('30%') - const fill = w.find('.progress-fill') - expect(fill.attributes('style')).toContain('width: 30%') - expect(fill.classes()).not.toContain('progress-fill--indeterminate') - expect(w.find('.progress-meta').text()).toBe('已采集 30 个商品 · 共 100 个 · 第 2 页 · 已回传 1 批') - expect(w.find('.progress-status').text()).toBe('正在获取店铺数据…') + expect(w.find('.task-item').exists()).toBe(true) + expect(w.find('.status').text()).toBe('正在获取店铺数据…') + const bar = w.find('.file-progress-bar') + expect(bar.exists()).toBe(true) + expect(bar.attributes('style')).toContain('width: 30%') + expect(w.find('.file-progress-meta').text()).toContain('已采集 30 个商品') }) - it('没有分母(total 缺失)时走不定态动画,不编造百分比', async () => { - api.fetchJdCollectProgress.mockResolvedValue(baseProgress({ total: null, page: null, batches: 0 })) - const w = await mountPage() - await startCollect(w) - - expect(w.find('.progress-percent').exists()).toBe(false) - expect(w.find('.progress-fill').classes()).toContain('progress-fill--indeterminate') - expect(w.find('.progress-meta').text()).toBe('已采集 30 个商品') - }) - - it('SUCCESS 终态:进度满格并提示已导入后台,且停止轮询', async () => { - api.fetchJdCollectProgress.mockResolvedValue(baseProgress({ itemsReceived: 100 })) - const w = await mountPage() - await startCollect(w) - - api.fetchJdCollectProgress.mockResolvedValue( - baseProgress({ status: 'SUCCESS', itemsReceived: 100 }), + it('没有分母(total 缺失)时只显示已采集行数,不编造百分比', async () => { + api.fetchJdCollectTaskProgressBatch.mockResolvedValue( + batchOf(historyItem({ total: null, page: null, itemsReceived: 30, rowCount: 30 })), ) - await vi.advanceTimersByTimeAsync(POLL_MS) - await flushPromises() - - expect(w.find('.progress-percent').text()).toBe('100%') - expect(w.find('.progress-status').text()).toBe('获取完成') - expect(w.find('.feedback.success').text()).toContain('已导入后台「京东数据库」') - const callsAfterTerminal = api.fetchJdCollectProgress.mock.calls.length - await vi.advanceTimersByTimeAsync(POLL_MS * 3) - await flushPromises() - expect(api.fetchJdCollectProgress.mock.calls.length).toBe(callsAfterTerminal) - }) - - it('FAILED 终态:用服务端原因说明失败,按钮恢复可点', async () => { - api.fetchJdCollectProgress.mockResolvedValue(baseProgress()) const w = await mountPage() await startCollect(w) - - api.fetchJdCollectProgress.mockResolvedValue( - baseProgress({ status: 'FAILED', message: '京麦后台未登录,请先在客户端登录京麦' }), - ) - await vi.advanceTimersByTimeAsync(POLL_MS) await flushPromises() - expect(w.find('.progress-status').text()).toBe('获取失败') - expect(w.find('.feedback.error').text()).toContain('京麦后台未登录') - expect(w.find('.collect-btn').attributes('disabled')).toBeUndefined() + const meta = w.find('.file-progress-meta') + expect(meta.exists()).toBe(true) + expect(meta.text()).toContain('已采集 30 个商品') + expect(meta.text()).not.toContain('%') + expect(w.find('.file-progress-bar').attributes('style')).toContain('width: 0%') }) - it('建单失败:只报错不留假进度条,一次进度请求也不发', async () => { + it('SUCCESS 终态:状态徽章落「获取完成」、进度满格,且从轮询中收手', async () => { + const w = await mountPage() + await startCollect(w) + await flushPromises() + + api.fetchJdCollectTaskProgressBatch.mockResolvedValue( + batchOf(historyItem({ taskStatus: 'SUCCESS', success: true, itemsReceived: 100, rowCount: 100 })), + ) + await vi.advanceTimersByTimeAsync(60_000) + await flushPromises() + + expect(w.find('.status').text()).toBe('获取完成') + // 终态任务没有进度条(isActiveTask 才有),行数行收口在卡片 extraLines + expect(w.find('.file-progress-bar').exists()).toBe(false) + expect(w.find('.task-item').text()).toContain('已采集 100 个商品') + // 终态即收手:再推进几轮轮询间隔,批量进度不再被调 + const callsAfterTerminal = api.fetchJdCollectTaskProgressBatch.mock.calls.length + await vi.advanceTimersByTimeAsync(60_000) + await flushPromises() + expect(api.fetchJdCollectTaskProgressBatch.mock.calls.length).toBe(callsAfterTerminal) + }) + + it('FAILED 终态:显示服务端原因、出「重试」按钮,重试走原位复位并重新激活推队列', async () => { + const w = await mountPage() + await startCollect(w) + await flushPromises() + + api.fetchJdCollectTaskProgressBatch.mockResolvedValue( + batchOf(historyItem({ + taskStatus: 'FAILED', + success: false, + errorMessage: '京麦后台未登录,请先在客户端登录京麦', + itemsReceived: 30, + })), + ) + await vi.advanceTimersByTimeAsync(60_000) + await flushPromises() + + expect(w.find('.status').text()).toBe('获取失败') + expect(w.find('.task-item').text()).toContain('京麦后台未登录') + const retryBtn = w.find('.btn-retry') + expect(retryBtn.exists()).toBe(true) + expect(retryBtn.text()).toBe('重试') + + await retryBtn.trigger('click') + await flushPromises() + // 铁律 26:原任务复位(不克隆新任务),复位后重新激活并推队列(断点续传) + expect(api.retryClientTask).toHaveBeenCalledWith(88) + expect(api.activateJdCollectTask).toHaveBeenCalledWith(88) + expect(api.enqueue).toHaveBeenCalled() + const pushPayload = api.enqueue.mock.calls.at(-1)?.[0] + expect(pushPayload?.type).toBe('jd-shop-collect-run') + expect(pushPayload?.data?.taskId).toBe(88) + }) + + it('建单失败:只报错不留假任务,一次批量进度请求也不发', async () => { api.createJdCollectTask.mockRejectedValue(new Error('缺少登录凭据')) const w = await mountPage() await startCollect(w) expect(w.find('.feedback.error').text()).toContain('缺少登录凭据') - expect(w.find('.progress-track').exists()).toBe(false) - expect(api.fetchJdCollectProgress).not.toHaveBeenCalled() + expect(api.fetchJdCollectTaskProgressBatch).not.toHaveBeenCalled() expect(api.enqueue).not.toHaveBeenCalled() }) @@ -191,8 +263,6 @@ describe('获取店铺数据:一键采集 + 进度条', () => { expect(api.activateJdCollectTask).toHaveBeenCalledWith(88) expect(api.enqueue).not.toHaveBeenCalled() expect(w.find('.feedback.error').text()).toContain('任务激活失败') - // 建单不回滚、进度照轮询:任务留在 PENDING,由服务端兜底拉取认领后照样会跑。 - expect(api.fetchJdCollectProgress).toHaveBeenCalledTimes(1) }) it('激活时服务端回「已在执行中」:等同激活成功,照常推队列', async () => { diff --git a/frontend-vue/tests/task-terminal-set-single-source.test.ts b/frontend-vue/tests/task-terminal-set-single-source.test.ts index 5e45e8dde..12eb9cff2 100644 --- a/frontend-vue/tests/task-terminal-set-single-source.test.ts +++ b/frontend-vue/tests/task-terminal-set-single-source.test.ts @@ -45,6 +45,7 @@ const NARROW_LEDGER: Record = { 'src/pages/brand/components/BrandPriceTrackTab.vue': 6, 'src/pages/brand/components/BrandProductRiskTab.vue': 2, 'src/pages/brand/components/BrandSimilarAsinTab.vue': 1, + 'src/pages/jd/JdCollectTab.vue': 1, 'src/shared/composables/useLiveTaskBoard.ts': 2, } const NARROW_BASELINE_TOTAL = Object.values(NARROW_LEDGER).reduce((a, b) => a + b, 0)