From e621deea5882f6c826b1355e7c51c5f71250a4d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Mon, 16 Nov 2026 20:14:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(jd-collect):=20=E5=BB=BA=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E6=8C=89=E4=BA=AC=E9=BA=A6=E5=BA=97=E5=86=85=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 客户口径「类目不需要只要分类」「做成多选的」:采集建单页下线类目级联与平台分组, 换京麦「店内分类」快照多选(getShopCategoryList 2026-11-16 取证 9 个,见 ops docs/jd-collect-api-contract.md §2.6)。建单请求体/页面推送/兜底拉取三处同键 shopCategoryNames+shopCategoryIds(label+id 双键,行级填充形状未取证,客户端任一 命中即命中);categoryPaths 标 @Deprecated 仅历史行兼容。超长归一化文案泛化为 normalizeStringSelection;历史行 VO 带回双键供重试/继续同源。 删除建单页唯一消费方的死件:JdCategoryCascader.vue/jd-category-tree.ts/其测试 (后管另有在用副本,不受影响)。 判据:JdCollectTaskServiceTest 三例(双键归一化/空白归 null/51 个拒)+ JdTaskPullSpiImplTest 七键载荷透传;前端 jd-collect-tab/jd-shop-category/mount 三支(快照消费、双键同链、绊线:级联组件与分组接口不得回流建单页)。 可读棘轮:JdCollectTab.vue 804→786 行(同款返回按钮 CSS 合并、死 .download 类删除)。 客户端侧(app_client jd_base 行级过滤)同窗另一仓提交。 --- .../model/dto/JdCollectTaskCreateRequest.java | 19 + .../jd/model/vo/JdCollectHistoryItemVo.java | 10 +- .../jd/service/JdCollectBoardService.java | 3 + .../jd/service/JdCollectTaskService.java | 23 +- .../modules/jd/service/JdTaskPullSpiImpl.java | 18 +- .../jd/service/JdCollectTaskServiceTest.java | 61 +++ .../jd/service/JdTaskPullSpiImplTest.java | 37 +- .../src/pages/jd/JdCategoryCascader.vue | 458 ------------------ frontend-vue/src/pages/jd/JdCollectTab.vue | 210 ++++---- frontend-vue/src/pages/jd/jd-category-tree.ts | 90 ---- frontend-vue/src/pages/jd/jd-shop-category.ts | 41 ++ .../shared/api/types/modules/jd-collect.ts | 27 +- frontend-vue/tests/jd-category-tree.test.ts | 97 ---- frontend-vue/tests/jd-collect-tab.test.ts | 52 +- frontend-vue/tests/jd-shop-category.test.ts | 54 +++ .../mount/jd-collect-progress.mount.test.ts | 90 ++-- 16 files changed, 435 insertions(+), 855 deletions(-) delete mode 100644 frontend-vue/src/pages/jd/JdCategoryCascader.vue delete mode 100644 frontend-vue/src/pages/jd/jd-category-tree.ts create mode 100644 frontend-vue/src/pages/jd/jd-shop-category.ts delete mode 100644 frontend-vue/tests/jd-category-tree.test.ts create mode 100644 frontend-vue/tests/jd-shop-category.test.ts diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdCollectTaskCreateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdCollectTaskCreateRequest.java index 6c88fe476..ec746b2a0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdCollectTaskCreateRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdCollectTaskCreateRequest.java @@ -31,6 +31,25 @@ public class JdCollectTaskCreateRequest { * 要采集的京麦末级类目名(多选,客户端按行 {@code categoryPath} 等值过滤,只对命中商品 * 开详情采集);null/空=全店采集。服务端建单口归一化(trim/去空/去重)后写进 * {@code request_json},与派发载荷、客户端过滤同源。 + * + * @deprecated 2026-11-16 建单页类目级联已下线(客户口径「类目不需要只要分类」),UI 不再 + * 产生该值;字段保留只为兼容已发版页面的历史行/在途任务(重试链从 request_json 回读)。 */ + @Deprecated private List categoryPaths; + + /** + * 要采集的京麦「店内分类」名(2026-11-16 取证后新增,客户口径「选京麦的内部分类去采集」): + * 多选 {@code ShopCategoryReadViewService.getShopCategoryList} 的 {@code label};客户端按行 + * {@code shopCategorys/shopCategoryPath/groupId} 等值过滤(任一键命中即命中)。null/空=全店采集。 + * 服务端建单口归一化后写进 {@code request_json},与派发载荷、客户端过滤三处同键。 + */ + private List shopCategoryNames; + + /** + * 要采集的京麦「店内分类」id(与 {@link #shopCategoryNames} 同一多选的 {@code value} 集)。 + * 行级 {@code shopCategorys} 填充形状未取证(可能是 id 数组也可能是对象),双键同发任一 + * 命中即命中;null/空=无 id 维度过滤。 + */ + private List shopCategoryIds; } 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 index 52b2215a1..3eaeed5ff 100644 --- 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 @@ -43,9 +43,17 @@ public class JdCollectHistoryItemVo { private List listTabs; @Schema(description = "建单时选择的采集类目(京麦末级类目名多选;空=全店采集)。" - + "「继续/重试」从历史行重建推送载荷时同源带回") + + "「继续/重试」从历史行重建推送载荷时同源带回。2026-11-16 建单页类目级联下线," + + "仅历史行/在途任务兼容") private List categoryPaths; + @Schema(description = "建单时选择的京麦店内分类名(多选;空=全店采集)。" + + "「继续/重试」从历史行重建推送载荷时同源带回") + private List shopCategoryNames; + + @Schema(description = "建单时选择的京麦店内分类 id(与 shopCategoryNames 同一多选的 value 集)") + private List shopCategoryIds; + @Schema(description = "已落京东数据库的商品行数(biz_jd_product 按 task_id 计数)", example = "1407") private Integer rowCount; 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 index 57e01df60..a5ce868cc 100644 --- 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 @@ -165,6 +165,9 @@ public class JdCollectBoardService { // 类目随建单载荷同源带回:重试/继续时页面从历史行重建推送载荷,缺了它 // 客户端会按全店采集跑(兜底拉取路径读 request_json 不受影响)。 item.setCategoryPaths(request.getCategoryPaths()); + // 店内分类双键同源带回(2026-11-16):label 与 id 都带,客户端任一键命中即命中。 + item.setShopCategoryNames(request.getShopCategoryNames()); + item.setShopCategoryIds(request.getShopCategoryIds()); } item.setRowCount(rowCount == null ? 0 : rowCount); fillProgress(item, task, scope); 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 60cb53523..35e66a790 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 @@ -156,36 +156,39 @@ public class JdCollectTaskService { if (request.getMaxProducts() != null && request.getMaxProducts() < 0) { throw new BusinessException("采集范围上限不能为负数"); } - // 类目归一化写回请求体:request_json 里的值必须就是闸门认可的值(铁律 27a 同源), + // 类目/分类归一化写回请求体:request_json 里的值必须就是闸门认可的值(铁律 27a 同源), // 派发载荷与客户端过滤都从这里读,不再各归各的。 - request.setCategoryPaths(normalizeCategoryPaths(request.getCategoryPaths())); + request.setCategoryPaths(normalizeStringSelection(request.getCategoryPaths(), "采集类目")); + request.setShopCategoryNames(normalizeStringSelection(request.getShopCategoryNames(), "采集分类")); + request.setShopCategoryIds(normalizeStringSelection(request.getShopCategoryIds(), "采集分类ID")); } /** - * 类目多选归一化:trim/去空/保序去重;全空白归 null(=不过滤,全店采集)。 + * 多选值归一化:trim/去空/保序去重;全空白归 null(=不过滤,全店采集)。 * 超限当场点名拒绝(建单口必须拦注定失败的输入),不静默截断。 + * {@code label} 进拒绝文案(类目/分类两条链共用同一上限常量)。 */ - private List normalizeCategoryPaths(List categoryPaths) { - if (categoryPaths == null || categoryPaths.isEmpty()) { + private List normalizeStringSelection(List raw, String label) { + if (raw == null || raw.isEmpty()) { return null; } Set normalized = new java.util.LinkedHashSet<>(); - for (String raw : categoryPaths) { - if (raw == null) { + for (String item : raw) { + if (item == null) { continue; } - String path = raw.trim(); + String path = item.trim(); if (path.isEmpty()) { continue; } if (path.length() > MAX_CATEGORY_PATH_LENGTH) { - throw new BusinessException("采集类目名过长(上限 " + MAX_CATEGORY_PATH_LENGTH + throw new BusinessException(label + "名过长(上限 " + MAX_CATEGORY_PATH_LENGTH + " 字): " + path.substring(0, 50) + "…"); } normalized.add(path); } if (normalized.size() > MAX_CATEGORY_PATHS) { - throw new BusinessException("采集类目最多选 " + MAX_CATEGORY_PATHS + " 个,当前 " + throw new BusinessException(label + "最多选 " + MAX_CATEGORY_PATHS + " 个,当前 " + normalized.size() + " 个"); } return normalized.isEmpty() ? null : List.copyOf(normalized); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImpl.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImpl.java index 3833d067e..731b73ad6 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImpl.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImpl.java @@ -17,9 +17,10 @@ import java.util.Map; * 页面推送缺失(只建单没推送 / 推送前关页面 / 纯浏览器打开)时任务会停在 PENDING, * {@code TaskClientPullService} 认领后由本实现组装可直接入队的载荷。{@code data} 的键集 * 与客户端 {@code jd_base.process_task} 的读取契约同键({@code taskId / shopName / - * listTabs / maxProducts / categoryPaths},{@code QUEUE_TYPE} 与客户端 - * {@code amazon.jd.jd_base.QUEUE_TYPE} 同值 {@code jd-shop-collect-run})——两处任意一处 - * 漂移,兜底拉下来的任务客户端不识别(categoryPaths 客户端读不到=不过滤,全店采集)。 + * listTabs / maxProducts / categoryPaths / shopCategoryNames / shopCategoryIds}, + * {@code QUEUE_TYPE} 与客户端 {@code amazon.jd.jd_base.QUEUE_TYPE} 同值 + * {@code jd-shop-collect-run})——两处任意一处漂移,兜底拉下来的任务客户端不识别 + * (categoryPaths/shopCategory* 客户端读不到=不过滤,全店采集)。
页面推送缺失(只建单没推送 / 推送前关页面 / 纯浏览器打开)时任务会停在 PENDING, * {@code TaskClientPullService} 认领后由本实现组装可直接入队的载荷。{@code data} 的键集 * 与客户端 {@code jd_base.process_task} 的读取契约同键({@code taskId / shopName / - * listTabs / maxProducts / categoryPaths},{@code QUEUE_TYPE} 与客户端 - * {@code amazon.jd.jd_base.QUEUE_TYPE} 同值 {@code jd-shop-collect-run})——两处任意一处 - * 漂移,兜底拉下来的任务客户端不识别(categoryPaths 客户端读不到=不过滤,全店采集)。
shopName/listTabs/maxProducts 从建单载荷({@code request_json})回读,与页面推送 * 同源;载荷解析失败按 SPI 语义返回 null(调用方会把任务标失败并回写原因),不静默出空载荷。