diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/ApiGuardCoverageAuditor.java b/backend-java/src/main/java/com/nanri/aiimage/config/ApiGuardCoverageAuditor.java index b7ba68816..dd5edd20e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/ApiGuardCoverageAuditor.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/ApiGuardCoverageAuditor.java @@ -118,11 +118,13 @@ public class ApiGuardCoverageAuditor implements SmartInitializingSingleton { * requireOwnershipUserId(fail-closed 401),chunk 与 heartbeat 和 collect-data/delete-brand * 同形状(本机桌面执行器不带凭据,行归属以任务 owner 投影);chunk 的 error 上报已接整单 * 判死,其 owner 对撞收口随 v1.4 Phase 6.1 落,判死口凭据化后随统一批进名单 - *
  • {@code /api/jd-publish} —— v1.5 京东商品上架任务面(建单/activate/items/progress/chunk/ - * heartbeat):与 /api/jd-collect 逐形状同族——建单等五端点方法体已有 requireOwnershipUserId - * (fail-closed 401,B98-07 同形债预防),chunk 判死口凭据化(isTrustedInternalToken, - * 匿名一律拒绝判死),行级落库与 jd-collect 同形状(本机桌面执行器不带凭据,行归属以 - * 任务 owner 投影);判死口凭据化后随统一批进名单
  • + *
  • {@code /api/jd-publish} —— v1.5 京东商品上架任务面(建单/products/activate/items/progress/ + * dashboard/history/progress-batch/delete/chunk/heartbeat):与 /api/jd-collect 逐形状同族——建单等 + * 写类端点方法体已有 requireOwnershipUserId + * (fail-closed 401,B98-07 同形债预防),products/dashboard/history/delete 走 resolveOwnershipUserId + * (Phase 4 面板读侧),progressBatch 走 require+filterOwnedTaskIds,chunk 判死口凭据化 + * (isTrustedInternalToken,匿名一律拒绝判死),行级落库与 jd-collect 同形状(本机桌面执行器不带凭据, + * 行归属以任务 owner 投影);判死口凭据化后随统一批进名单
  • * */ static final Set PENDING_CONVERGENCE = Set.of( diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdPublishController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdPublishController.java index f47470678..96c8cf151 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdPublishController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdPublishController.java @@ -1,17 +1,26 @@ 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.JdPublishChunkRequest; +import com.nanri.aiimage.modules.jd.model.dto.JdPublishTaskBatchRequest; import com.nanri.aiimage.modules.jd.model.dto.JdPublishTaskCreateRequest; +import com.nanri.aiimage.modules.jd.model.vo.JdProductPageVo; import com.nanri.aiimage.modules.jd.model.vo.JdPublishChunkVo; +import com.nanri.aiimage.modules.jd.model.vo.JdPublishDashboardVo; +import com.nanri.aiimage.modules.jd.model.vo.JdPublishHistoryVo; import com.nanri.aiimage.modules.jd.model.vo.JdPublishItemsPageVo; import com.nanri.aiimage.modules.jd.model.vo.JdPublishProgressVo; +import com.nanri.aiimage.modules.jd.model.vo.JdPublishTaskBatchVo; import com.nanri.aiimage.modules.jd.model.vo.JdPublishTaskVo; +import com.nanri.aiimage.modules.jd.service.JdProductQueryService; +import com.nanri.aiimage.modules.jd.service.JdPublishBoardService; import com.nanri.aiimage.modules.jd.service.JdPublishIngestService; import com.nanri.aiimage.modules.jd.service.JdPublishTaskService; 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.TaskProgressOwnershipSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -19,6 +28,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,6 +55,9 @@ public class JdPublishController { private final JdPublishTaskService publishTaskService; private final JdPublishIngestService ingestService; + private final JdPublishBoardService boardService; + private final JdProductQueryService jdProductQueryService; + private final TaskProgressOwnershipSupport progressOwnershipSupport; private final AdminAuthSupport adminAuthSupport; @PostMapping("/tasks") @@ -134,4 +147,75 @@ public class JdPublishController { return ApiResponse.success(publishTaskService.heartbeat(taskId, adminAuthSupport.requireOwnershipUserId(httpRequest, userId), request)); } + + // ------------------------------------------------------------------ + // v1.5 Phase 4:用户端「商品上架」页读侧(选品分页+任务面板四端点)。 + // 形状照 JdCollectController 面板段同族:dashboard/history/delete 走 resolve, + // progressBatch 走 requireOwnershipUserId+filterOwnedTaskIds;products 按会话 + // 身份只回归属当前用户的商品行(AC-9 owner 过滤,跨用户商品 0 返回)。 + // ------------------------------------------------------------------ + + @GetMapping("/products") + @Operation(summary = "用户端选品分页(归属过滤)", description = "「商品上架」页选品列表:只回归属当前" + + "登录用户的京东数据库商品行(AC-9 owner 过滤,跨用户商品 0 返回),可按自定义分类过滤" + + "(分类 id 经 V203 归属表两步下推:先取 product_id 集,再 in 主键)。") + public ApiResponse products( + @Parameter(description = "自定义分类 id(不传=全部归属商品)") + @RequestParam(name = "category_id", required = false) Long categoryId, + @Parameter(description = "页码") @RequestParam(name = "page", defaultValue = PageDefaults.FIRST_PAGE) Long page, + @Parameter(description = "每页数量") @RequestParam(name = "page_size", defaultValue = PageDefaults.JD_PRODUCTS_PAGE_SIZE) Long pageSize, + @Parameter(description = "当前用户 ID;省略时取当前登录身份", required = false) + @RequestParam(value = "user_id", required = false) Long userId, + HttpServletRequest httpRequest) { + userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId); + return ApiResponse.success(jdProductQueryService.pageForUser(userId, categoryId, page, pageSize)); + } + + @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 = "当前用户最近的上架任务历史(活跃任务排前)," + + "含行级四档计数(待发布/发布中/成功/失败)与建单载荷带回(分类 id/改价规则,重试重建推送载荷用)。") + 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); + return ApiResponse.success(boardService.history(userId, limit)); + } + + @PostMapping("/tasks/progress/batch") + @Operation(summary = "批量查询上架任务进度", description = "任务面板只对活跃任务调用该接口,建议 6 秒一次。" + + "归属先由公共出口按会话身份过滤,返回任务头 + 行级四档计数。") + public ApiResponse progressBatch(@Valid @RequestBody JdPublishTaskBatchRequest request, + HttpServletRequest httpRequest) { + return ApiResponse.success(boardService.progressBatch(progressOwnershipSupport + .filterOwnedTaskIds(request.getTaskIds(), + adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())))); + } + + @DeleteMapping("/tasks/{taskId}") + @Operation(summary = "删除上架任务", description = "删除当前用户的一条京东商品上架任务," + + "连带清理该任务的发布明细快照行(发布不落商品行,无京东数据库清理语义)。") + public ApiResponse deleteTask( + @Parameter(description = "任务 ID", required = true, example = "34400") + @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); + } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishTaskBatchRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishTaskBatchRequest.java new file mode 100644 index 000000000..f9ffca8f4 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishTaskBatchRequest.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 JdCollectTaskBatchRequest} 同族)。 + * {@code userId} 可省略:归属过滤主体是 {@code TaskProgressOwnershipSupport.filterOwnedTaskIds} + * 按会话身份判定,请求体里的 userId 只作 admin 代客的归属提示。 + */ +@Data +@Schema(description = "京东商品上架批量进度请求") +public class JdPublishTaskBatchRequest { + + @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/JdPublishDashboardVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishDashboardVo.java new file mode 100644 index 000000000..b00a8a27f --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishDashboardVo.java @@ -0,0 +1,27 @@ +package com.nanri.aiimage.modules.jd.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 京东商品上架任务面板总览(v1.5 Phase 4,用户端「商品上架」统计卡数据源)。 + * + *

    形状照 {@code JdCollectDashboardVo} 同族:当前用户的运行中/成功/失败任务数, + * 已结束=成功+失败。页面进入时请求一次,不参与轮询。

    + */ +@Data +@Schema(description = "京东商品上架任务总览") +public class JdPublishDashboardVo { + + @Schema(description = "运行中任务数(含排队)") + private long pendingTaskCount; + + @Schema(description = "已结束任务数(成功+失败)") + private long processedTaskCount; + + @Schema(description = "成功任务数") + private long successTaskCount; + + @Schema(description = "失败任务数") + private long failedTaskCount; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryItemVo.java new file mode 100644 index 000000000..6c707c8c5 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryItemVo.java @@ -0,0 +1,67 @@ +package com.nanri.aiimage.modules.jd.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Map; + +/** + * 京东商品上架任务历史行(v1.5 Phase 4,任务面板历史层数据源)。 + * + *

    行级计数(待发布/发布中/成功/失败)来自 {@code biz_jd_publish_item} 按任务聚合; + * 建单载荷(分类 id + 改价规则)随行带回——失败任务「重试」时页面用它重建推送载荷 + * (铁律 26 原任务复位 + 铁律 32 第三件同键:重建的载荷与建单响应 queuePayload 同形状)。

    + */ +@Data +@Schema(description = "京东商品上架任务历史行") +public class JdPublishHistoryItemVo { + + @Schema(description = "任务 ID") + private Long taskId; + + @Schema(description = "任务编号") + private String taskNo; + + @Schema(description = "biz_file_task.status 原值:PENDING/RUNNING/SUCCESS/FAILED") + private String taskStatus; + + @Schema(description = "任务是否成功") + private boolean success; + + @Schema(description = "终态原因(非终态为 null)") + private String errorMessage; + + @Schema(description = "建单所选自定义分类 id(biz_jd_product_group.id)") + private Long categoryId; + + @Schema(description = "建单统一改价规则(原样带回,重试重建推送载荷用;空=原价)") + private Map priceRule; + + @Schema(description = "商品明细总行数") + private long productTotal; + + @Schema(description = "待发布行数") + private long pendingCount; + + @Schema(description = "发布中行数") + private long publishingCount; + + @Schema(description = "成功行数") + private long successCount; + + @Schema(description = "失败行数") + private long failedCount; + + @Schema(description = "任务创建时刻") + private String createdAt; + + @Schema(description = "任务结束时刻") + private String finishedAt; + + @Schema(description = "最近更新时刻") + private String updatedAt; + + @Schema(description = "改价规则里的加价值(percent 百分数 / fixed 金额;仅展示用)") + private BigDecimal priceRuleValue; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryVo.java new file mode 100644 index 000000000..0ba204937 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryVo.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 JdCollectHistoryVo} 同族)。 */ +@Data +@Schema(description = "京东商品上架任务历史") +public class JdPublishHistoryVo { + + @Schema(description = "历史行") + private List items = new ArrayList<>(); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishTaskBatchVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishTaskBatchVo.java new file mode 100644 index 000000000..13d48eafb --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishTaskBatchVo.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 JdCollectTaskBatchVo} 同族;查不到的任务进 missingTaskIds)。 */ +@Data +@Schema(description = "京东商品上架批量进度") +public class JdPublishTaskBatchVo { + + @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/JdPublishTaskDetailVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishTaskDetailVo.java new file mode 100644 index 000000000..ed8e1f892 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishTaskDetailVo.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 JdCollectTaskDetailVo} 同族)。 */ +@Data +@Schema(description = "京东商品上架任务进度条目") +public class JdPublishTaskDetailVo { + + @Schema(description = "任务头") + private JdPublishTaskItemVo task; + + @Schema(description = "最新进度行(单元素)") + private List items = new ArrayList<>(); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishTaskItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishTaskItemVo.java new file mode 100644 index 000000000..118c5983c --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishTaskItemVo.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 JdCollectTaskItemVo} 同族)。 */ +@Data +@Schema(description = "京东商品上架任务头") +public class JdPublishTaskItemVo { + + @Schema(description = "任务 ID") + private Long id; + + @Schema(description = "任务编号") + private String taskNo; + + @Schema(description = "任务状态") + private String status; + + @Schema(description = "终态原因") + private String errorMessage; + + @Schema(description = "最近更新时刻") + private String updatedAt; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdProductQueryService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdProductQueryService.java index 09e792670..5cc9df57c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdProductQueryService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdProductQueryService.java @@ -117,6 +117,53 @@ public class JdProductQueryService { return vo; } + /** + * 用户端「商品上架」选品分页(v1.5 Phase 4,AC-9 owner 过滤):只回归属当前用户的行, + * 可按自定义分类过滤。分类过滤不走 wrapper 原生 EXISTS(SqlLayeringConventionTest + * rawSqlInsideWrappersDoesNotGrow 钉死不涨):先从 V203 归属表取该分类的 product_id 集, + * 再 in 主键——分类规模=组内商品数,量级可控;分类空集直接回空页不查主表。 + * 页码钳制与 {@link #page} 同出口(MAX_PAGE/MAX_PAGE_SIZE,铁律 15)。 + */ + public JdProductPageVo pageForUser(Long userId, Long categoryId, Long page, Long pageSize) { + long safePage = page == null || page < 1 ? 1 : Math.min(page, MAX_PAGE); + long safeSize = pageSize == null ? PageDefaults.JD_PRODUCTS_PAGE_SIZE_INT + : Math.min(Math.max(pageSize, 1), MAX_PAGE_SIZE); + LambdaQueryWrapper query = new LambdaQueryWrapper() + .eq(JdProductEntity::getUserId, userId); + if (categoryId != null && categoryId > 0) { + List productIds = jdProductGroupAssignMapper.selectList( + new LambdaQueryWrapper() + .select(JdProductGroupAssignEntity::getProductId) + .eq(JdProductGroupAssignEntity::getCategoryId, categoryId)) + .stream().map(JdProductGroupAssignEntity::getProductId).distinct().toList(); + if (productIds.isEmpty()) { + return emptyPage(safePage, safeSize); + } + query.in(JdProductEntity::getId, productIds); + } + long total = jdProductMapper.selectCount(query); + List items = total <= 0 ? List.of() + : jdProductMapper.selectList(query + .orderByDesc(JdProductEntity::getSyncedAt, JdProductEntity::getId) + .last("limit " + (safePage - 1) * safeSize + ", " + safeSize)) + .stream().map(this::toListItem).toList(); + JdProductPageVo vo = new JdProductPageVo(); + vo.setItems(items); + vo.setTotal(total); + vo.setPage(safePage); + vo.setPageSize(safeSize); + return vo; + } + + private static JdProductPageVo emptyPage(long page, long pageSize) { + JdProductPageVo vo = new JdProductPageVo(); + vo.setItems(List.of()); + vo.setTotal(0L); + vo.setPage(page); + vo.setPageSize(pageSize); + return vo; + } + /** * 类目筛选下拉数据源(2026-11-15 用户口径「京麦的类目也要同步过来后台」): * 已落库行 distinct 的 {@code category_path}(=京麦末级类目名,契约 §2.3 E3) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardService.java new file mode 100644 index 000000000..bff7321af --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardService.java @@ -0,0 +1,254 @@ +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.JdPublishItemMapper; +import com.nanri.aiimage.modules.jd.model.dto.JdPublishTaskCreateRequest; +import com.nanri.aiimage.modules.jd.model.entity.JdPublishItemEntity; +import com.nanri.aiimage.modules.jd.model.vo.JdPublishDashboardVo; +import com.nanri.aiimage.modules.jd.model.vo.JdPublishHistoryItemVo; +import com.nanri.aiimage.modules.jd.model.vo.JdPublishHistoryVo; +import com.nanri.aiimage.modules.jd.model.vo.JdPublishTaskBatchVo; +import com.nanri.aiimage.modules.jd.model.vo.JdPublishTaskDetailVo; +import com.nanri.aiimage.modules.jd.model.vo.JdPublishTaskItemVo; +import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; +import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +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 Phase 4,用户端「商品上架」实时任务面板四端点)。 + * + *

    形状照 {@code JdCollectBoardService} 同族裁剪:京东发布没有 + * {@code biz_task_scope_state} 游标(进度真源是 {@code biz_jd_publish_item} 的行级状态, + * {@code JdPublishTaskService#queryProgress} 同口径),历史行的「行级计数」改从明细表 + * GROUP BY 聚合;删除面只清明细行+任务主行(发布不落商品行,无京东数据库清理语义)。

    + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class JdPublishBoardService { + + private static final int MAX_HISTORY_LIMIT = 100; + + private final FileTaskMapper fileTaskMapper; + private final JdPublishItemMapper jdPublishItemMapper; + private final ObjectMapper objectMapper; + + /** 查询当前用户的面板总览(运行中/成功/失败三档计数,已结束=成功+失败)。 */ + public JdPublishDashboardVo dashboard(Long userId) { + JdPublishDashboardVo vo = new JdPublishDashboardVo(); + 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, JdPublishTaskService.MODULE_TYPE) + .eq(FileTaskEntity::getUserId, userId) + .eq(FileTaskEntity::getStatus, status)); + } + + /** + * 查询当前用户最近的任务历史(活跃任务排前,其余按最近更新时间倒序)。 + * 行级计数批量回查:一条 GROUP BY(task_id, publish_status)出全部任务的四档计数, + * 不逐任务一条聚合查询(100 行上限打爆面板的同族教训)。 + */ + public JdPublishHistoryVo 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, JdPublishTaskService.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())); + + Map> countsByTask = countItemsByTask( + tasks.stream().map(FileTaskEntity::getId).toList()); + + JdPublishHistoryVo vo = new JdPublishHistoryVo(); + for (FileTaskEntity task : tasks) { + vo.getItems().add(toHistoryItem(task, + countsByTask.getOrDefault(task.getId(), Map.of()))); + } + return vo; + } + + private static boolean isActive(FileTaskEntity task) { + return TaskStatuses.FileTask.ACTIVE.contains(task.getStatus()); + } + + /** 批量行级计数:一条 GROUP BY 出全部任务的 PENDING/PUBLISHING/SUCCESS/FAILED 行数。 */ + private Map> countItemsByTask(List taskIds) { + Map> counts = new HashMap<>(); + if (taskIds.isEmpty()) { + return counts; + } + List> rows = jdPublishItemMapper.selectMaps(new QueryWrapper() + .select("task_id", "publish_status", "count(*) as cnt") + .in("task_id", taskIds) + .groupBy("task_id", "publish_status")); + for (Map row : rows) { + Long taskId = row.get("task_id") == null ? null : Long.valueOf(String.valueOf(row.get("task_id"))); + Object status = row.get("publish_status"); + Object cnt = row.get("cnt"); + if (taskId == null || status == null || !(cnt instanceof Number number)) { + continue; + } + counts.computeIfAbsent(taskId, key -> new LinkedHashMap<>()) + .put(String.valueOf(status), number.longValue()); + } + return counts; + } + + /** 组装历史行:任务头 + 建单载荷(分类 id/改价规则,宽松读) + 行级四档计数。 */ + private JdPublishHistoryItemVo toHistoryItem(FileTaskEntity task, Map counts) { + JdPublishHistoryItemVo item = new JdPublishHistoryItemVo(); + item.setTaskId(task.getId()); + item.setTaskNo(task.getTaskNo()); + item.setTaskStatus(task.getStatus()); + item.setSuccess(TaskStatuses.FileTask.SUCCESS.equals(task.getStatus())); + item.setErrorMessage(task.getErrorMessage()); + JdPublishTaskCreateRequest request = readCreateRequestQuiet(task); + if (request != null) { + item.setCategoryId(request.getCategoryId()); + if (request.getPriceRule() != null) { + Map rule = new LinkedHashMap<>(); + rule.put("mode", request.getPriceRule().getMode()); + rule.put("value", request.getPriceRule().getValue()); + item.setPriceRule(rule); + item.setPriceRuleValue(request.getPriceRule().getValue()); + } + } + item.setProductTotal(counts.values().stream().mapToLong(Long::longValue).sum()); + item.setPendingCount(counts.getOrDefault(JdPublishTaskService.ITEM_PENDING, 0L)); + item.setPublishingCount(counts.getOrDefault(JdPublishTaskService.ITEM_PUBLISHING, 0L)); + item.setSuccessCount(counts.getOrDefault(JdPublishTaskService.ITEM_SUCCESS, 0L)); + item.setFailedCount(counts.getOrDefault(JdPublishTaskService.ITEM_FAILED, 0L)); + if (task.getCreatedAt() != null) { + item.setCreatedAt(task.getCreatedAt().toString()); + } + if (task.getFinishedAt() != null) { + item.setFinishedAt(task.getFinishedAt().toString()); + } + if (task.getUpdatedAt() != null) { + item.setUpdatedAt(task.getUpdatedAt().toString()); + } + return item; + } + + /** 历史行宽松读建单载荷:载荷缺失/损坏时只少分类 id 与改价规则,不把历史面板打成红条。 */ + private JdPublishTaskCreateRequest readCreateRequestQuiet(FileTaskEntity task) { + if (task.getRequestJson() == null || task.getRequestJson().isBlank()) { + return null; + } + try { + return objectMapper.readValue(task.getRequestJson(), JdPublishTaskCreateRequest.class); + } catch (Exception ex) { + log.warn("[jd-publish] 建单载荷解析失败,历史行少分类/改价 taskId={} err={}", + task.getId(), ex.getMessage()); + return null; + } + } + + /** + * 批量查任务进度(前端轮询专用,归属已由 {@code TaskProgressOwnershipSupport} 过滤)。 + * 形状照采集面板:每任务一条 {@code {task, items:[最新进度行]}},查不到的进 missingTaskIds。 + */ + public JdPublishTaskBatchVo progressBatch(List taskIds) { + Set normalized = new LinkedHashSet<>(); + if (taskIds != null) { + for (Long id : taskIds) { + if (id != null && id > 0) { + normalized.add(id); + } + } + } + JdPublishTaskBatchVo vo = new JdPublishTaskBatchVo(); + if (normalized.isEmpty()) { + return vo; + } + List tasks = fileTaskMapper.selectList( + new LambdaQueryWrapper().in(FileTaskEntity::getId, normalized)); + List hitIds = new ArrayList<>(); + Map> countsByTask = countItemsByTask( + tasks.stream().map(FileTaskEntity::getId).toList()); + for (FileTaskEntity task : tasks) { + if (!JdPublishTaskService.MODULE_TYPE.equals(task.getModuleType())) { + continue; + } + hitIds.add(task.getId()); + JdPublishTaskItemVo taskItem = new JdPublishTaskItemVo(); + 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()); + JdPublishTaskDetailVo detail = new JdPublishTaskDetailVo(); + detail.setTask(taskItem); + detail.getItems().add(toHistoryItem(task, + countsByTask.getOrDefault(task.getId(), Map.of()))); + vo.getItems().add(detail); + } + for (Long id : normalized) { + if (!hitIds.contains(id)) { + vo.getMissingTaskIds().add(id); + } + } + return vo; + } + + /** + * 删除任务:明细快照行按 {@code task_id} 清 + 任务主行。事务内只做 DB 删除—— + * 发布不落商品行/图片行(京东数据库是采集面的数据),没有额外清理语义。 + */ + @Transactional + public void deleteTask(Long taskId, Long userId) { + FileTaskEntity task = fileTaskMapper.selectById(taskId); + if (task == null || !JdPublishTaskService.MODULE_TYPE.equals(task.getModuleType()) + || (userId != null && task.getUserId() != null && !Objects.equals(userId, task.getUserId()))) { + throw new BusinessException("任务不存在"); + } + int items = jdPublishItemMapper.delete(new LambdaQueryWrapper() + .eq(JdPublishItemEntity::getTaskId, taskId)); + fileTaskMapper.deleteById(taskId); + log.info("[jd-publish] 删除任务 taskId={} userId={} 明细行={}", taskId, userId, items); + } + + /** 供测试确认行级计数口径(BigDecimal 展示值从 priceRule 原样带回)。 */ + static BigDecimal priceRuleValueOf(JdPublishTaskCreateRequest request) { + return request.getPriceRule() == null ? null : request.getPriceRule().getValue(); + } + + /** 时间列统一字符串(LocalDateTime.toString;空值原样 null,与采集面板同口径)。 */ + static String timeText(LocalDateTime value) { + return value == null ? null : value.toString(); + } +} diff --git a/backend-java/src/test/java/com/nanri/aiimage/common/security/RequestSuppliedIdentityOutletTest.java b/backend-java/src/test/java/com/nanri/aiimage/common/security/RequestSuppliedIdentityOutletTest.java index 38da52d05..93deaea12 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/common/security/RequestSuppliedIdentityOutletTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/common/security/RequestSuppliedIdentityOutletTest.java @@ -113,7 +113,11 @@ class RequestSuppliedIdentityOutletTest { // + POST /api/jd-publish/tasks/{taskId}/heartbeat(都是 @RequestParam("user_id") 先过 // requireOwnershipUserId);chunk 回传不走身份出口(判死口凭据化 isTrustedInternalToken, // JdPublishChunkRequest 不带 userId 字段),不计入——覆盖面变大,不是放宽分母。 - assertThat(scan.boundWrite()).as("取请求身份且已接出口的写类 handler 数").isEqualTo(136); + // 138 而不是 136:2026-11-18 v1.5 Phase 4 京东上架用户端读侧新增两支写类端点—— + // POST /api/jd-publish/tasks/progress/batch(request.userId 先过 requireOwnershipUserId 再 + // filterOwnedTaskIds 过滤归属)+ DELETE /api/jd-publish/tasks/{taskId}(@RequestParam("user_id") + // 先过 resolveOwnershipUserId,删除任务行连带发布明细快照行)——覆盖面变大,不是放宽分母。 + assertThat(scan.boundWrite()).as("取请求身份且已接出口的写类 handler 数").isEqualTo(138); // 64 而不是 63:2026-10-29 随本地采集开关恢复 GET /tasks/{taskId}/queue-payload, // 该 handler 同时接上 resolveOwnershipUserId(不是放宽分母)。 // 65 而不是 64:2026-11-14 v1.4 新增 JdCollectController GET /api/jd-collect/tasks/{taskId}/progress @@ -125,7 +129,11 @@ class RequestSuppliedIdentityOutletTest { // 69 而不是 67:2026-11-18 v1.5 Phase 2 新增两支读类端点——GET /api/jd-publish/tasks/{taskId}/items // + GET /api/jd-publish/tasks/{taskId}/progress,都是 @RequestParam("user_id") 先过 // requireOwnershipUserId——覆盖面变大,不是放宽分母。 - assertThat(scan.boundRead()).as("取请求身份且已接出口的读类 handler 数").isEqualTo(69); + // 72 而不是 69:2026-11-18 v1.5 Phase 4 京东上架用户端读侧新增三支读类端点—— + // GET /api/jd-publish/products(选品分页,AC-9 owner 过滤)+ GET /api/jd-publish/dashboard + // + GET /api/jd-publish/history(面板统计卡+历史层),都是 @RequestParam("user_id") 先过 + // resolveOwnershipUserId——覆盖面变大,不是放宽分母。 + assertThat(scan.boundRead()).as("取请求身份且已接出口的读类 handler 数").isEqualTo(72); assertThat(scan.unbound()).as("取请求身份但未接出口的 handler:只剩豁免那一条") .containsExactlyElementsOf(ALLOWED_WITHOUT_OUTLET); } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdProductQueryServiceUserPageTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdProductQueryServiceUserPageTest.java new file mode 100644 index 000000000..f70276873 --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdProductQueryServiceUserPageTest.java @@ -0,0 +1,150 @@ +package com.nanri.aiimage.modules.jd.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.nanri.aiimage.modules.jd.mapper.JdProductGroupAssignMapper; +import com.nanri.aiimage.modules.jd.mapper.JdProductGroupMapper; +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.entity.JdProductEntity; +import com.nanri.aiimage.modules.jd.model.vo.JdProductPageVo; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.math.BigDecimal; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * 用户端「商品上架」选品分页(v1.5 Phase 4,AC-9 owner 过滤的服务端半边)。 + * + *

    判据四件:① 归属条件恒带(user_id 来自会话出口,跨用户商品 0 返回);② 分类过滤走 + * V203 归属表两步下推(先取 product_id 集再 in 主键,不往 wrapper 夹原生 SQL);③ 分类空集 + * 直接回空页不查主表;④ 页码/页宽钳制照管理面同出口(MAX_PAGE/MAX_PAGE_SIZE,铁律 15)。

    + */ +@ExtendWith(MockitoExtension.class) +class JdProductQueryServiceUserPageTest { + + @Mock + private JdProductMapper jdProductMapper; + @Mock + private JdProductImageMapper jdProductImageMapper; + @Mock + private JdProductSkuMapper jdProductSkuMapper; + @Mock + private JdProductGroupMapper jdProductGroupMapper; + @Mock + private JdProductGroupAssignMapper jdProductGroupAssignMapper; + + @InjectMocks + private JdProductQueryService service; + + @BeforeAll + static void initMybatisPlusTableInfo() { + // LambdaQueryWrapper 需要 MP 的 lambda cache(ProgressQueryOwnershipOutletTest 同款初始化)。 + 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, + JdProductEntity.class); + com.baomidou.mybatisplus.core.metadata.TableInfoHelper.initTableInfo(assistant, + com.nanri.aiimage.modules.jd.model.entity.JdProductGroupAssignEntity.class); + } + + private JdProductEntity product(long id) { + JdProductEntity row = new JdProductEntity(); + row.setId(id); + row.setUserId(7L); + row.setTitle("测试商品 " + id); + row.setProductCode("P" + id); + row.setPriceMin(new BigDecimal("10.50")); + row.setStockTotal(3); + return row; + } + + private com.nanri.aiimage.modules.jd.model.entity.JdProductGroupAssignEntity assign(long productId) { + com.nanri.aiimage.modules.jd.model.entity.JdProductGroupAssignEntity row = + new com.nanri.aiimage.modules.jd.model.entity.JdProductGroupAssignEntity(); + row.setProductId(productId); + row.setCategoryId(3L); + row.setOwnerGroupId(2L); + return row; + } + + @Test + void 选品分页只回归属当前用户的行() { + when(jdProductMapper.selectCount(any())).thenReturn(1L); + when(jdProductMapper.selectList(any())).thenReturn(List.of(product(11L))); + + JdProductPageVo vo = service.pageForUser(7L, null, 1L, 20L); + + ArgumentCaptor> captor = + ArgumentCaptor.forClass(LambdaQueryWrapper.class); + verify(jdProductMapper).selectCount(captor.capture()); + captor.getValue().getSqlSegment(); // MP 惯例:先求值一次才铺出参数 + assertThat(captor.getValue().getSqlSegment()).as("归属条件恒在主查询里").contains("user_id"); + assertThat(captor.getValue().getParamNameValuePairs().values()).contains(7L); + assertThat(vo.getTotal()).isEqualTo(1L); + assertThat(vo.getItems()).hasSize(1); + assertThat(vo.getItems().get(0).getTitle()).isEqualTo("测试商品 11"); + // 没选分类不查归属表 + verify(jdProductGroupAssignMapper, never()).selectList(any()); + } + + @Test + void 分类过滤_先取归属表产品集再进主查询() { + when(jdProductGroupAssignMapper.selectList(any())) + .thenReturn(List.of(assign(11L), assign(12L), assign(11L))); + when(jdProductMapper.selectCount(any())).thenReturn(1L); + when(jdProductMapper.selectList(any())).thenReturn(List.of(product(12L))); + + JdProductPageVo vo = service.pageForUser(7L, 3L, 1L, 20L); + + ArgumentCaptor> captor = + ArgumentCaptor.forClass(LambdaQueryWrapper.class); + verify(jdProductMapper).selectCount(captor.capture()); + captor.getValue().getSqlSegment(); + assertThat(captor.getValue().getSqlSegment()) + .as("分类集以 IN 下推进主查询(owner 条件仍然恒在)") + .contains("user_id").contains("IN"); + assertThat(captor.getValue().getParamNameValuePairs().values()) + .contains(7L, 11L, 12L); + assertThat(vo.getItems()).hasSize(1); + } + + @Test + void 分类空集直接回空页不查主表() { + when(jdProductGroupAssignMapper.selectList(any())).thenReturn(List.of()); + + JdProductPageVo vo = service.pageForUser(7L, 3L, 1L, 20L); + + assertThat(vo.getTotal()).isZero(); + assertThat(vo.getItems()).isEmpty(); + verify(jdProductMapper, never()).selectCount(any()); + verify(jdProductMapper, never()).selectList(any()); + } + + @Test + void 页码页宽钳制_离谱页码不喂负下标() { + when(jdProductMapper.selectCount(any())).thenReturn(0L); + + JdProductPageVo zero = service.pageForUser(7L, null, 0L, 5000L); + assertThat(zero.getPage()).as("页码下限钳到 1").isEqualTo(1L); + assertThat(zero.getPageSize()).as("页宽上限钳到 100").isEqualTo(100L); + + JdProductPageVo huge = service.pageForUser(7L, null, Long.MAX_VALUE, 20L); + assertThat(huge.getPage()).as("页码上限钳到 10000(乘积不溢出,铁律 15 同形)").isEqualTo(10000L); + verify(jdProductMapper, never()).selectList(any()); + } +} diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardServiceTest.java new file mode 100644 index 000000000..a37e3602d --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardServiceTest.java @@ -0,0 +1,167 @@ +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.JdPublishItemMapper; +import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; +import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InOrder; +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.ArrayList; +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.inOrder; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * 京东商品上架任务面板服务(v1.5 Phase 4 面板四端点)。 + * + *

    判据四件:① 总览三档计数(已结束=成功+失败);② 历史行读真源(行级四档计数来自 + * {@code biz_jd_publish_item} GROUP BY 聚合,分类 id/改价规则从建单载荷带回);③ 批量进度 + * 按模块过滤,非本模块任务进 missingTaskIds 不冒充面板条目;④ 删除面校验归属后才清明细行 + * +任务主行(发布不落商品行,无京东数据库清理语义)。

    + */ +@ExtendWith(MockitoExtension.class) +class JdPublishBoardServiceTest { + + @Mock + private FileTaskMapper fileTaskMapper; + @Mock + private JdPublishItemMapper jdPublishItemMapper; + @Spy + private ObjectMapper objectMapper = new ObjectMapper(); + + @InjectMocks + private JdPublishBoardService service; + + @BeforeEach + void setUp() { + // LambdaQueryWrapper 需要 MP 的 lambda cache(JdCollectBoardServiceTest 同款初始化)。 + 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.JdPublishItemEntity.class); + com.baomidou.mybatisplus.core.metadata.TableInfoHelper.initTableInfo(assistant, + com.nanri.aiimage.modules.task.model.entity.FileTaskEntity.class); + } + + private FileTaskEntity task(long id, long userId, String status) { + FileTaskEntity task = new FileTaskEntity(); + task.setId(id); + task.setModuleType(JdPublishTaskService.MODULE_TYPE); + task.setUserId(userId); + task.setTaskNo("JD_PUBLISH-" + id); + task.setStatus(status); + task.setRequestJson("{\"userId\":" + userId + ",\"categoryId\":3,\"productIds\":[11,12]," + + "\"priceRule\":{\"mode\":\"percent\",\"value\":10}}"); + task.setCreatedAt(LocalDateTime.of(2026, 11, 18, 10, 0)); + task.setUpdatedAt(LocalDateTime.of(2026, 11, 18, 10, 1)); + return task; + } + + @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(34400L, 7L, "RUNNING"); + FileTaskEntity failed = task(34399L, 7L, "FAILED"); + // selectList 先出 history 主查询(按 createdAt 倒序 limit),乱序返回验证排序 + when(fileTaskMapper.selectList(any())).thenReturn(new ArrayList<>(List.of(failed, running))); + // 一条 GROUP BY(task_id, publish_status)出全部任务的四档计数 + when(jdPublishItemMapper.selectMaps(any())).thenReturn(List.of( + Map.of("task_id", 34400L, "publish_status", "SUCCESS", "cnt", 5L), + Map.of("task_id", 34400L, "publish_status", "PUBLISHING", "cnt", 2L), + Map.of("task_id", 34399L, "publish_status", "SUCCESS", "cnt", 3L), + Map.of("task_id", 34399L, "publish_status", "FAILED", "cnt", 1L))); + + var vo = service.history(7L, 50); + + assertThat(vo.getItems()).hasSize(2); + // 活跃(RUNNING)排前:失败任务往后靠 + assertThat(vo.getItems().get(0).getTaskId()).isEqualTo(34400L); + var first = vo.getItems().get(0); + assertThat(first.getCategoryId()).as("分类 id 随建单载荷带回").isEqualTo(3L); + assertThat(first.getPriceRule()) + .as("改价规则随建单载荷带回(重试重建推送载荷与建单响应 queuePayload 同键)") + .containsEntry("mode", "percent").containsEntry("value", java.math.BigDecimal.TEN); + assertThat(first.getProductTotal()).as("总行数=四档计数之和(SUCCESS5+PUBLISHING2)").isEqualTo(7L); + assertThat(first.getSuccessCount()).isEqualTo(5L); + assertThat(first.getPublishingCount()).isEqualTo(2L); + assertThat(first.getPendingCount()).isEqualTo(0L); + assertThat(first.getFailedCount()).isEqualTo(0L); + var second = vo.getItems().get(1); + assertThat(second.getTaskStatus()).isEqualTo("FAILED"); + assertThat(second.getFailedCount()).as("失败行单独计数").isEqualTo(1L); + assertThat(second.getSuccessCount()).isEqualTo(3L); + } + + @Test + void 批量进度按模块过滤_非本模块任务进missingTaskIds() { + FileTaskEntity publish = task(88L, 7L, "RUNNING"); + FileTaskEntity collect = task(89L, 7L, "RUNNING"); + collect.setModuleType("JD_SHOP_COLLECT"); + when(fileTaskMapper.selectList(any())).thenReturn(List.of(publish, collect)); + when(jdPublishItemMapper.selectMaps(any())).thenReturn( + List.of(Map.of("task_id", 88L, "publish_status", "SUCCESS", "cnt", 2L))); + + var 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).getSuccessCount()).isEqualTo(2L); + 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(jdPublishItemMapper, never()).delete(any()); + verify(fileTaskMapper, never()).deleteById(any(java.io.Serializable.class)); + } + + @Test + void 删除任务_先清明细快照行再清任务行() { + FileTaskEntity mine = task(88L, 7L, "FAILED"); + when(fileTaskMapper.selectById(88L)).thenReturn(mine); + when(jdPublishItemMapper.delete(any())).thenReturn(2); + + service.deleteTask(88L, 7L); + + InOrder order = inOrder(jdPublishItemMapper, fileTaskMapper); + order.verify(jdPublishItemMapper).delete(any()); + order.verify(fileTaskMapper).deleteById(any(java.io.Serializable.class)); + } +} diff --git a/frontend-vue/src/pages/jd/JdPublishTab.vue b/frontend-vue/src/pages/jd/JdPublishTab.vue new file mode 100644 index 000000000..ddeb54238 --- /dev/null +++ b/frontend-vue/src/pages/jd/JdPublishTab.vue @@ -0,0 +1,615 @@ + + + + + + diff --git a/frontend-vue/src/pages/jd/tool-catalog.ts b/frontend-vue/src/pages/jd/tool-catalog.ts index 456644508..95f5587f0 100644 --- a/frontend-vue/src/pages/jd/tool-catalog.ts +++ b/frontend-vue/src/pages/jd/tool-catalog.ts @@ -3,7 +3,7 @@ * * 一级入口在桌面首页(与「亚马逊 / 视频」并列,见 DesktopHomePage),进来后是这两个菜单: * 1. 获取店铺数据:一键抓已登录京麦后台的店铺商品(列表 + 详情 + 图片),落后台「京东数据库」; - * 2. 商品上架:功能未落地,先按"假菜单"占位(点击提示暂未开通),不发 href。 + * 2. 商品上架(v1.5 Phase 4 转正式):选自定义分类勾商品建单,本机已登录京麦的客户端逐个发布; * * 卡片形状照亚马逊工具台(tool-catalog.ts)的 ToolInfo,样式复用同一套深色卡片墙。 * @@ -44,8 +44,9 @@ export const JD_TOOLS: ReadonlyArray = [ { id: 'jd-publish', name: '商品上架', - desc: '把京东数据库里的商品批量上架到京麦店铺(建设中,敬请期待)', - tag: '规划中', + desc: '把京东数据库里你自己的商品批量上架到京麦店铺:选分类、勾商品、可选统一改价,本机客户端逐个发布', + tag: '核心', + href: '/jd-publish', permissionKeys: ['jd-publish'], }, ] diff --git a/frontend-vue/src/router/index.ts b/frontend-vue/src/router/index.ts index 9bcd72ac3..99dd7975a 100644 --- a/frontend-vue/src/router/index.ts +++ b/frontend-vue/src/router/index.ts @@ -78,6 +78,11 @@ const routes = [ name: 'jd-collect', component: () => import('@/pages/jd/JdCollectTab.vue'), }, + { + path: '/jd-publish', + name: 'jd-publish', + component: () => import('@/pages/jd/JdPublishTab.vue'), + }, { path: '/split', name: 'split', diff --git a/frontend-vue/src/shared/api/endpoints.ts b/frontend-vue/src/shared/api/endpoints.ts index b5c0f8f6d..21eb1e8c4 100644 --- a/frontend-vue/src/shared/api/endpoints.ts +++ b/frontend-vue/src/shared/api/endpoints.ts @@ -226,6 +226,25 @@ export const API_ENDPOINTS = { /** 删除任务(连带清理京东数据库该任务的商品/图片/SKU 行与断点游标) */ deleteTask: '/api/jd-collect/tasks/{taskId}', }, + /** 京东商品上架(v1.5 Phase 4):用户端建单/激活/选品/面板;派发载荷 type=jd-product-publish-run 由服务端下发 */ + jdPublish: { + /** 建单(请求体 categoryId+productIds+priceRule,响应带 queuePayload 页面直推) */ + create: '/api/jd-publish/tasks', + /** 激活(PENDING→RUNNING):推客户端队列之前必须调用(2026-11-14 采集链真机实录同因) */ + activate: '/api/jd-publish/tasks/{taskId}/activate', + /** 用户端选品分页(AC-9 owner 过滤:只回归属当前用户的京东数据库商品行) */ + products: '/api/jd-publish/products', + /** 任务面板总览(运行中/成功/失败计数统计卡) */ + dashboard: '/api/jd-publish/dashboard', + /** 任务历史(活跃任务排前,含行级四档计数与建单载荷带回) */ + history: '/api/jd-publish/history', + /** 批量任务进度(面板轮询专用,归属先经公共出口过滤) */ + progressBatch: '/api/jd-publish/tasks/progress/batch', + /** 单任务行级进度(行级四档计数;面板批量口覆盖不到的兜底) */ + progress: '/api/jd-publish/tasks/{taskId}/progress', + /** 删除任务(连带清理该任务的发布明细快照行) */ + deleteTask: '/api/jd-publish/tasks/{taskId}', + }, userSecret: { bundle: '/api/user-secrets', save: '/api/user-secrets/{moduleKey}', diff --git a/frontend-vue/src/shared/api/types/modules/jd-publish.ts b/frontend-vue/src/shared/api/types/modules/jd-publish.ts new file mode 100644 index 000000000..742d40f56 --- /dev/null +++ b/frontend-vue/src/shared/api/types/modules/jd-publish.ts @@ -0,0 +1,283 @@ +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 { getTaskProgressCacheTtlMs, getTaskProgressTimeoutMs } from '../../../task-progress-config.ts' +import { createTaskProgressRequestCache } from '../../../task-progress-request-cache.ts' + +/** + * 京东商品上架(v1.5 蓝图 docs/ITERATION_PLAN.md §3/§4 Phase 4):用户端「京东工具台 → + * 商品上架」选自定义分类 → 勾选归属自己的商品(AC-9 owner 过滤)→ 可选统一改价规则 → + * 建单(服务端落 PENDING、执行通道显式 LOCAL)→ 建单响应 queuePayload 原样投 + * api.enqueue_json 推本机客户端(铁律 32 第三件,type 与 SPI QUEUE_TYPE 同值)。 + * + * 面板三件(dashboard/history/progressBatch)与删除/中断照 jd-collect 同族形状; + * 分类读取唯一来源仍是 jdCollect.groups 既有出口(B113-01,AC-9 源码绊线钉死)。 + */ + +/** 建单回执:任务落 PENDING;queuePayload 页面直推本机队列(服务端组装,页面不拼载荷)。 */ +export interface JdPublishTaskVo { + taskId: number; + taskNo?: string; + collectChannel?: string; + /** {type:'jd-product-publish-run', data:{taskId, priceRule}}(铁律 32 第三件) */ + queuePayload?: Record; +} + +/** 建单统一改价规则:none 原价 / percent 加价百分比(value=百分数) / fixed 固定加价(value=金额)。 */ +export interface JdPublishPriceRule { + mode: 'none' | 'percent' | 'fixed'; + value?: number; +} + +/** + * 建单(AC-1/AC-8/AC-9):categoryId=所选自定义分类;productIds=勾选的商品行 id 集 + * (服务端按 owner 校验,选了他人商品/超配额当场业务码拒绝并点名文案)。 + * 请求体是 JSON(@RequestBody + JdPublishTaskCreateRequest),字段名 camelCase 与采集建单同口径。 + */ +export function createJdPublishTask( + categoryId: number | null, + productIds: number[], + priceRule: JdPublishPriceRule, +) { + return unwrapJavaResponse(post, Record>( + buildJavaUrl(API_ENDPOINTS.jdPublish.create), + { + userId: getCurrentUserId(), + categoryId, + productIds, + // mode=none 时不带 value(后端 normalizePriceRule 对 none 忽略 value) + priceRule: priceRule.mode === 'none' ? { mode: 'none' } : priceRule, + }, + )) +} + +/** 激活任务(PENDING→RUNNING):推客户端队列之前必须调用(漏掉=分片全被拒,采集链真机实录同因)。 */ +export function activateJdPublishTask(taskId: number) { + const path = buildJavaUrl(API_ENDPOINTS.jdPublish.activate.replace('{taskId}', String(taskId))) + const query = `?user_id=${encodeURIComponent(String(getCurrentUserId()))}` + return unwrapJavaResponse(post, Record>(path + query, {})) +} + +// --------------------------------------------------------------------------- +// 选品分页(AC-9 owner 过滤):服务端只回归属当前用户的京东数据库商品行。 +// 形状照后管京东数据库列表行裁剪(选品面板只需要主字段,attr/detail 不下发)。 +// --------------------------------------------------------------------------- + +export interface JdPublishProductVo { + id: number; + shopName?: string; + productCode?: string; + skuCount?: number; + title?: string; + categoryPath?: string; + priceMin?: number; + priceMax?: number; + stockTotal?: number; + saleStatus?: string; + mainImageUrl?: string; + imageCount?: number; + syncedAt?: string; +} + +export interface JdPublishProductPageVo { + items: JdPublishProductVo[]; + total: number; + page: number; + pageSize: number; +} + +/** 选品分页:categoryId 缺省=全部归属商品(分类下拉唯一来源是 jdCollect.groups 既有出口,AC-9)。 */ +export function fetchJdPublishProducts(categoryId: number | null, page: number, pageSize: number) { + const params: Record = { + user_id: getCurrentUserId(), + page, + page_size: pageSize, + } + if (categoryId != null && categoryId > 0) { + params.category_id = categoryId + } + return unwrapJavaResponse( + get>( + buildJavaUrl(API_ENDPOINTS.jdPublish.products), + { params }, + ), + ); +} + +// --------------------------------------------------------------------------- +// 任务面板(v1.5 Phase 4):总览统计卡 / 历史层(行级四档计数)/ 活跃任务批量进度 / 删除。 +// 形状照 jd-collect 同族;京东发布没有结果文件,没有 downloadUrl / fileStatus 那一层。 +// --------------------------------------------------------------------------- + +/** 任务面板总览(运行中/已结束/成功/失败任务数)。 */ +export interface JdPublishDashboardVo { + pendingTaskCount: number; + processedTaskCount: number; + successTaskCount: number; + failedTaskCount: number; +} + +/** 历史行(任务卡片数据源)。行级四档计数来自发布明细表聚合(服务端真源,不编造分母)。 */ +export interface JdPublishHistoryItemVo { + taskId?: number; + taskNo?: string; + /** biz_file_task.status 原值:PENDING/RUNNING/SUCCESS/FAILED */ + taskStatus?: string; + success?: boolean; + errorMessage?: string; + /** 建单所选自定义分类 id;重试重建推送载荷时同源带回 */ + categoryId?: number; + /** 建单统一改价规则(原样带回;重试重建推送载荷与建单响应 queuePayload 同键) */ + priceRule?: { mode?: string; value?: number }; + /** 商品明细总行数 */ + productTotal?: number; + pendingCount?: number; + publishingCount?: number; + successCount?: number; + failedCount?: number; + createdAt?: string; + finishedAt?: string; + updatedAt?: string; +} + +export interface JdPublishHistoryVo { + items: JdPublishHistoryItemVo[]; +} + +/** 批量进度条目:任务头 + 单元素进度行(与 jd-collect TaskDetailVo 同形)。 */ +export interface JdPublishTaskDetailVo { + task?: { + id?: number; + taskNo?: string; + status?: string; + errorMessage?: string; + updatedAt?: string; + }; + items?: JdPublishHistoryItemVo[]; +} + +export interface JdPublishTaskBatchVo { + items: JdPublishTaskDetailVo[]; + missingTaskIds: number[]; +} + +export function fetchJdPublishDashboard() { + return unwrapJavaResponse( + get>( + buildJavaUrl(API_ENDPOINTS.jdPublish.dashboard), + { params: { user_id: getCurrentUserId() } }, + ), + ); +} + +export function fetchJdPublishHistory() { + return unwrapJavaResponse( + get>( + buildJavaUrl(API_ENDPOINTS.jdPublish.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(',')}`; +} + +/** 批量进度请求缓存(与 jd-collect 同一形状: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 fetchJdPublishTaskProgressBatch( + taskIds: number[], + options: JdProgressBatchOptions = {}, +) { + return postTaskProgressBatch( + buildJavaUrl(API_ENDPOINTS.jdPublish.progressBatch), + taskIds, + options, + ); +} + +/** 删除任务:服务端连带清理该任务的发布明细快照行。 */ +export function deleteJdPublishTask(taskId: number) { + return unwrapJavaResponse( + del>( + buildJavaUrl(API_ENDPOINTS.jdPublish.deleteTask.replace('{taskId}', String(taskId))), + { params: { user_id: getCurrentUserId() } }, + ), + ); +} + +/** + * 用户中断任务:在跑/待跑的任务落 CANCELLED——客户端心跳拿到 notAlive 后协作停止, + * 已发布的行保留在发布明细里,之后可「继续」接着跑(断点游标服务端按 PENDING 行下发)。 + * 通用任务中断端点(TaskHeartbeatController),与采集中断同形。 + */ +export function interruptJdPublishTask(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 687b5a81f..df9368bb5 100644 --- a/frontend-vue/tests/catch-silence-ratchet.test.ts +++ b/frontend-vue/tests/catch-silence-ratchet.test.ts @@ -91,7 +91,11 @@ const BASELINE = { // 都能看到」):JdCollectTab.vue 的 loadGroups catch——分类只是展示项,拉取失败 // ElMessage.warning 当场说给用户、原文只进 console,采集主路照常;非静默, // silent 一格没涨,只进 blocks。 - blocks: 319, + // 324 = 319 + 5(2026-11-18 v1.5 Phase 4 京东商品上架用户端):JdPublishTab.vue + + // jd-publish.ts 新增 5 支 try/catch(分类/商品列表拉取失败落到界面反馈、激活失败 + // 降级为提示由客户端兜底拉取认领、重试/建单入口异常 ElMessage),全部非静默 + // ("新增静默文件"断言未触发),silent 一格没涨,只进 blocks。 + blocks: 324, // 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 83930f265..dd659a087 100644 --- a/frontend-vue/tests/endpoints.test.ts +++ b/frontend-vue/tests/endpoints.test.ts @@ -90,6 +90,7 @@ test('test_progress_batch_paths_match_controllers', () => { '/api/shop-data-crawl/tasks/progress/batch', '/api/withdraw/tasks/progress/batch', '/api/jd-collect/tasks/progress/batch', + '/api/jd-publish/tasks/progress/batch', ].sort(), 'progress/batch 端点应与 Java controller 路由一一对应', ) @@ -338,6 +339,19 @@ test('test_endpoints_frozen_snapshot', () => { "progressBatch": "/api/jd-collect/tasks/progress/batch", "deleteTask": "/api/jd-collect/tasks/{taskId}" }, + // 2026-11-18 v1.5 Phase 4:京东商品上架(建单/激活/选品/面板七件)。建单响应 queuePayload + // 由服务端组装(type=jd-product-publish-run 与 SPI 同值,铁律 32 第三件),页面原样投 + // api.enqueue_json;分类读取唯一来源仍是 jdCollect.groups(B113-01,AC-9 源码绊线钉死)。 + "jdPublish": { + "create": "/api/jd-publish/tasks", + "activate": "/api/jd-publish/tasks/{taskId}/activate", + "products": "/api/jd-publish/products", + "dashboard": "/api/jd-publish/dashboard", + "history": "/api/jd-publish/history", + "progressBatch": "/api/jd-publish/tasks/progress/batch", + "progress": "/api/jd-publish/tasks/{taskId}/progress", + "deleteTask": "/api/jd-publish/tasks/{taskId}" + }, "userSecret": { "bundle": "/api/user-secrets", "save": "/api/user-secrets/{moduleKey}", diff --git a/frontend-vue/tests/jd-console-tool-catalog.test.ts b/frontend-vue/tests/jd-console-tool-catalog.test.ts index 7600bcbbc..0578c09e6 100644 --- a/frontend-vue/tests/jd-console-tool-catalog.test.ts +++ b/frontend-vue/tests/jd-console-tool-catalog.test.ts @@ -28,11 +28,11 @@ test('京东工作台只有两个菜单:获取店铺数据 + 商品上架', () assert.ok(JD_TOOL_MAP.get('jd-collect'), 'JD_TOOL_MAP 应按 id 命中获取店铺数据') }) -test('获取店铺数据指向采集页,商品上架先做占位菜单', () => { +test('获取店铺数据指向采集页,商品上架已转正式挂 /jd-publish(v1.5 Phase 4)', () => { const collect = JD_TOOLS.find((tool) => tool.id === 'jd-collect') const publish = JD_TOOLS.find((tool) => tool.id === 'jd-publish') assert.equal(collect?.href, '/jd-collect', '获取店铺数据应指向 /jd-collect') - assert.equal(publish?.href, undefined, '商品上架先做假菜单:不得挂路由') + assert.equal(publish?.href, '/jd-publish', '商品上架已转正式:指向 /jd-publish(占位态已随 v1.5 Phase 4 下线)') }) test('路由器注册京东工作台与采集页', () => { @@ -40,6 +40,7 @@ test('路由器注册京东工作台与采集页', () => { assert.ok(router.includes("path: '/jd-console'"), 'router 缺 /jd-console') assert.ok(router.includes('JdConsolePage.vue'), 'router 未指向 JdConsolePage') assert.ok(router.includes("path: '/jd-collect'"), 'router 缺 /jd-collect') + assert.ok(router.includes("path: '/jd-publish'"), 'router 缺 /jd-publish(v1.5 Phase 4 转正式)') }) test('首页京东入口与亚马逊/视频并列', () => { diff --git a/frontend-vue/tests/jd-publish-tab.test.ts b/frontend-vue/tests/jd-publish-tab.test.ts index 8af21fbc0..88b7022e4 100644 --- a/frontend-vue/tests/jd-publish-tab.test.ts +++ b/frontend-vue/tests/jd-publish-tab.test.ts @@ -9,8 +9,8 @@ import { join } from 'node:path' * 1. **立即生效**(AC-9 前端绊线,B113-01):`/api/jd-collect/groups` 是京东分类的 * 唯一读取口——全 src 不得出现第三个裸 URL 消费点;发布页要分类数据必须走 * endpoints.jdCollect.groups 的既有 fetch 函数(出现第二个分类口即红)。 - * 2. **Pending Phase 4**(每支带 skip):JdPublishTab(分类→商品→改价→建单→实时面板) - * 落地后移除对应 skip 跑绿——蓝图 §4 Phase 4【待激活验收测试】登记的就是这份清单。 + * 2. **Phase 4 契约**(2026-11-18 随 Phase 4 落地移除 skip 正式激活):JdPublishTab + * (分类→商品→改价→建单→实时面板)的 5 支验收契约,蓝图 §4 Phase 4【待激活验收测试】清单。 */ const ROOT = process.cwd() @@ -45,19 +45,19 @@ test('AC-9: 京东分类读取口全 src 唯一(B113-01 绊线)', () => { // ---------------------------------------------------------- Pending Phase 4 -test('AC-9: JdPublishTab 分类选择消费唯一 groups 出口', { skip: 'Pending Phase 4: JdPublishTab 落地后移除 skip' }, () => { +test('AC-9: JdPublishTab 分类选择消费唯一 groups 出口', () => { const tab = read('src/pages/jd/JdPublishTab.vue', '商品上架页') assert.ok(tab.includes('jdCollect'), 'JdPublishTab 的分类数据必须走 endpoints.jdCollect/groups 既有 fetch(AC-9),不得自拼 URL') assert.ok(!tab.includes('jd-collect/groups'), 'JdPublishTab 不得裸写分类 URL(B113-01 绊线)') }) -test('AC-9: 商品列表只拉归属当前用户的行(owner 过滤)', { skip: 'Pending Phase 4: JdPublishTab 落地后移除 skip' }, () => { +test('AC-9: 商品列表只拉归属当前用户的行(owner 过滤)', () => { const tab = read('src/pages/jd/JdPublishTab.vue', '商品上架页') assert.ok(tab.includes('productIds') || tab.includes('productId'), 'JdPublishTab 建单提交必须携带勾选的商品 id 集合(服务端按 owner 校验,跨用户商品 0 返回)') }) -test('建单请求体形状:categoryId + productIds + priceRule{mode,value}', { skip: 'Pending Phase 4: JdPublishTab 落地后移除 skip' }, () => { +test('建单请求体形状:categoryId + productIds + priceRule{mode,value}', () => { const tab = read('src/pages/jd/JdPublishTab.vue', '商品上架页') // 蓝图 §3 死契约:POST /api/jd-publish/tasks 请求体 {categoryId, productIds[], priceRule:{mode,value?}} assert.ok(tab.includes('categoryId'), '建单体缺 categoryId(所选自定义分类)') @@ -66,13 +66,13 @@ test('建单请求体形状:categoryId + productIds + priceRule{mode,value}', 'priceRule.mode 三档(none/percent/fixed)必须与蓝图 §3 同值') }) -test('endpoints 注册 jdPublish 端点组(建单/items/chunk 三件)', { skip: 'Pending Phase 4: endpoints 扩组后移除 skip' }, () => { +test('endpoints 注册 jdPublish 端点组(建单/items/chunk 三件)', () => { const endpoints = read('src/shared/api/endpoints.ts', 'endpoints.ts') assert.ok(endpoints.includes('jdPublish'), 'endpoints.ts 缺 jdPublish 端点组') assert.ok(endpoints.includes('/api/jd-publish/tasks'), 'jdPublish 组缺建单端点 /api/jd-publish/tasks') }) -test('商品上架占位卡转正式:jd-publish 卡挂 /jd-publish 路由', { skip: 'Pending Phase 4: 占位卡转正式时移除 skip(须同步改 jd-console-tool-catalog.test.ts 的占位锁)' }, () => { +test('商品上架占位卡转正式:jd-publish 卡挂 /jd-publish 路由', () => { const catalog = read('src/pages/jd/tool-catalog.ts', 'jd/tool-catalog.ts') const router = read('src/router/index.ts', 'router/index.ts') assert.ok(/id:\s*'jd-publish'[\s\S]*?href:\s*'\/jd-publish'/.test(catalog), diff --git a/frontend-vue/tests/mount/jd-console-pending-menu.mount.test.ts b/frontend-vue/tests/mount/jd-console-pending-menu.mount.test.ts index 90bce5a6e..636643a99 100644 --- a/frontend-vue/tests/mount/jd-console-pending-menu.mount.test.ts +++ b/frontend-vue/tests/mount/jd-console-pending-menu.mount.test.ts @@ -3,8 +3,12 @@ * * 三件事一起判,缺一条就是假绿: * ① 两个菜单名都在 DOM 里(获取店铺数据 / 商品上架); - * ② 获取店铺数据是「可用」卡片(有 href → router-link 分支,文案是「打开工具」); - * ③ 商品上架是「假菜单」:没有 href,点开只弹一句「暂未开通」,不发任何请求。 + * ② 两张卡都是「可用」卡片(有 href → router-link 分支,文案是「打开工具」); + * ③ 商品上架卡(v1.5 Phase 4 由占位转正式)的 router-link 指向 /jd-publish。 + * + * 历史锁(2026-11-17):本文件原本钉「商品上架是假菜单(tool-card--pending,点开只弹 + * 暂未开通)」;占位随 Phase 4 转正式后这两条断言翻转为可用卡形状,假菜单分支在 + * JdConsolePage 保留为通用防御(后续新工具再用)。 * * 跑法:cd frontend-vue && npx vitest run(tests/mount/** 由 vitest.config.ts 收)。 */ @@ -20,8 +24,8 @@ function mountConsole() { global: { stubs: { NotificationBell: true, - RouterLink: { template: '' }, - 'router-link': { template: '' }, + RouterLink: { props: ['to'], template: '' }, + 'router-link': { props: ['to'], template: '' }, }, }, }) @@ -47,21 +51,19 @@ describe('京东工作台两个菜单', () => { expect(w.findAll('.tool-card').length).toBe(2) }) - it('获取店铺数据是可用卡片,商品上架是占位(暂未开通)', () => { + it('两张卡都是可用卡片(转正式后无占位态)', () => { const w = mountConsole() const cards = w.findAll('.tool-card') expect(cards[0].classes()).not.toContain('tool-card--pending') expect(cards[0].text()).toContain('打开工具') - expect(cards[1].classes()).toContain('tool-card--pending') - expect(cards[1].text()).toContain('暂未开通') + expect(cards[1].classes()).not.toContain('tool-card--pending') + expect(cards[1].text()).toContain('打开工具') }) - it('点假菜单只弹提示,不跳转', async () => { + it('商品上架卡的 router-link 指向 /jd-publish(占位已转正式)', () => { const w = mountConsole() - const pending = w.findAll('.tool-card')[1] - await pending.trigger('click') - const toast = w.find('.toast') - expect(toast.text()).toContain('商品上架暂未开通') - expect(toast.classes()).toContain('show') + const links = w.findAll('a.router-link-stub').map((a) => a.attributes('data-to')) + expect(links).toContain('/jd-collect') + expect(links).toContain('/jd-publish') }) }) 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 12eb9cff2..db014dd5c 100644 --- a/frontend-vue/tests/task-terminal-set-single-source.test.ts +++ b/frontend-vue/tests/task-terminal-set-single-source.test.ts @@ -46,6 +46,8 @@ const NARROW_LEDGER: Record = { 'src/pages/brand/components/BrandProductRiskTab.vue': 2, 'src/pages/brand/components/BrandSimilarAsinTab.vue': 1, 'src/pages/jd/JdCollectTab.vue': 1, + // v1.5 Phase 4:商品上架页同形(settleOnTaskStatuses 需含 CANCELLED,与采集页同因不入共用词表) + 'src/pages/jd/JdPublishTab.vue': 1, 'src/shared/composables/useLiveTaskBoard.ts': 2, } const NARROW_BASELINE_TOTAL = Object.values(NARROW_LEDGER).reduce((a, b) => a + b, 0)