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* 客户端读不到=不过滤,全店采集)。

* *

shopName/listTabs/maxProducts 从建单载荷({@code request_json})回读,与页面推送 * 同源;载荷解析失败按 SPI 语义返回 null(调用方会把任务标失败并回写原因),不静默出空载荷。

@@ -50,9 +51,16 @@ public class JdTaskPullSpiImpl implements ClientTaskPullSpi { // 缺省放空列表(不是 null):键集稳定,客户端读空集合=不过滤,语义与缺键一致。 data.put("categoryPaths", create.getCategoryPaths() == null ? List.of() : create.getCategoryPaths()); - log.info("[jd-collect] 兜底载荷已组装 taskId={} shopName={} tabs={} categories={}", + // 店内分类双键(2026-11-16):label 与 value(id) 同发,行级填充形状未取证(可能是 + // id 数组也可能是对象),客户端任一键命中即命中——只发一个键会让另一形状全空。 + data.put("shopCategoryNames", create.getShopCategoryNames() == null + ? List.of() : create.getShopCategoryNames()); + data.put("shopCategoryIds", create.getShopCategoryIds() == null + ? List.of() : create.getShopCategoryIds()); + log.info("[jd-collect] 兜底载荷已组装 taskId={} shopName={} tabs={} categories={} shopCategories={}", task.getId(), create.getShopName(), create.getListTabs(), - create.getCategoryPaths() == null ? 0 : create.getCategoryPaths().size()); + create.getCategoryPaths() == null ? 0 : create.getCategoryPaths().size(), + create.getShopCategoryNames() == null ? 0 : create.getShopCategoryNames().size()); return Map.of("type", QUEUE_TYPE, "data", data); } } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdCollectTaskServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdCollectTaskServiceTest.java index bee59808e..81119e547 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdCollectTaskServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdCollectTaskServiceTest.java @@ -162,4 +162,65 @@ class JdCollectTaskServiceTest { assertThat(stored.getCategoryPaths()) .as("全空白类目归 null=全店采集(既有行为,不因新参数收紧)").isNull(); } + + @Test + void 店内分类双键归一化后落requestJson() throws Exception { + when(fileTaskMapper.insert(any(FileTaskEntity.class))).thenAnswer(invocation -> { + invocation.getArgument(0, FileTaskEntity.class).setId(33893L); + return 1; + }); + JdCollectTaskCreateRequest request = validRequest(); + // 2026-11-16 店内分类双键(label + value/id):与类目同一归一化出口(trim/去空/保序去重)。 + request.setShopCategoryNames(new java.util.ArrayList<>(java.util.Arrays.asList( + " 工作制服 ", "拉丁舞服", "工作制服", " "))); + request.setShopCategoryIds(new java.util.ArrayList<>(java.util.Arrays.asList( + " 1024347567 ", "1024347572", "1024347567"))); + + service.createTask(request, "device-abc"); + + ArgumentCaptor taskCaptor = ArgumentCaptor.forClass(FileTaskEntity.class); + verify(fileTaskMapper).insert(taskCaptor.capture()); + JdCollectTaskCreateRequest stored = new ObjectMapper().readValue( + taskCaptor.getValue().getRequestJson(), JdCollectTaskCreateRequest.class); + assertThat(stored.getShopCategoryNames()) + .as("request_json 里的店内分类名=归一化后的值(铁律 27a 同源)") + .containsExactly("工作制服", "拉丁舞服"); + assertThat(stored.getShopCategoryIds()).containsExactly("1024347567", "1024347572"); + } + + @Test + void 店内分类全空白视为不过滤() throws Exception { + when(fileTaskMapper.insert(any(FileTaskEntity.class))).thenAnswer(invocation -> { + invocation.getArgument(0, FileTaskEntity.class).setId(33894L); + return 1; + }); + JdCollectTaskCreateRequest request = validRequest(); + request.setShopCategoryNames(new java.util.ArrayList<>(java.util.Arrays.asList(" ", ""))); + request.setShopCategoryIds(new java.util.ArrayList<>(java.util.Arrays.asList(" ", ""))); + + service.createTask(request, "device-abc"); + + ArgumentCaptor taskCaptor = ArgumentCaptor.forClass(FileTaskEntity.class); + verify(fileTaskMapper).insert(taskCaptor.capture()); + JdCollectTaskCreateRequest stored = new ObjectMapper().readValue( + taskCaptor.getValue().getRequestJson(), JdCollectTaskCreateRequest.class); + assertThat(stored.getShopCategoryNames()) + .as("全空白分类归 null=全店采集(与类目同口径)").isNull(); + assertThat(stored.getShopCategoryIds()).isNull(); + } + + @Test + void 超过店内分类上限建单被拒并点名() { + JdCollectTaskCreateRequest request = validRequest(); + java.util.List tooMany = new java.util.ArrayList<>(); + for (int i = 0; i < 51; i++) { + tooMany.add("分类" + i); + } + request.setShopCategoryNames(tooMany); + + assertThatThrownBy(() -> service.createTask(request, null)) + .isInstanceOf(BusinessException.class) + .hasMessageContaining("采集分类最多选 50 个"); + verify(fileTaskMapper, never()).insert(any(FileTaskEntity.class)); + } } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImplTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImplTest.java index bac9ffbfa..739f41780 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImplTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImplTest.java @@ -71,10 +71,16 @@ class JdTaskPullSpiImplTest { assertThat(data.get("categoryPaths")) .as("建单没选类目时派空列表(键集稳定,客户端读空=不过滤全店采集)") .isEqualTo(List.of()); - // 客户端 process_task 只读这五键:多键无害,缺键即空跑——所以逐键钉 + assertThat(data.get("shopCategoryNames")) + .as("建单没选店内分类时派空列表(2026-11-16 双键契约,同 categoryPaths 口径)") + .isEqualTo(List.of()); + assertThat(data.get("shopCategoryIds")).isEqualTo(List.of()); + // 客户端 process_task 只读这七键:多键无害,缺键即空跑——所以逐键钉 assertThat(data.keySet()) - .as("data 键集与客户端 jd_base.process_task 读取契约同键(taskId/shopName/listTabs/maxProducts/categoryPaths)") - .containsExactlyInAnyOrder("taskId", "shopName", "listTabs", "maxProducts", "categoryPaths"); + .as("data 键集与客户端 jd_base.process_task 读取契约同键(taskId/shopName/listTabs/" + + "maxProducts/categoryPaths/shopCategoryNames/shopCategoryIds)") + .containsExactlyInAnyOrder("taskId", "shopName", "listTabs", "maxProducts", + "categoryPaths", "shopCategoryNames", "shopCategoryIds"); } @Test @@ -97,6 +103,31 @@ class JdTaskPullSpiImplTest { .isEqualTo(List.of("女装", "男装")); } + @Test + void 店内分类双键随载荷透传客户端() throws Exception { + FileTaskEntity withShopCategories = task(); + withShopCategories.setRequestJson("{\"userId\":7,\"shopName\":\"测试旗舰店\"," + + "\"listTabs\":[\"ONSALE\"],\"maxProducts\":0," + + "\"shopCategoryNames\":[\"工作制服\",\"拉丁舞服\"]," + + "\"shopCategoryIds\":[\"1024347567\",\"1024347572\"]}"); + when(collectTaskService.readCreateRequest(any(FileTaskEntity.class))) + .thenAnswer(invocation -> { + FileTaskEntity t = invocation.getArgument(0); + return new ObjectMapper().readValue(t.getRequestJson(), JdCollectTaskCreateRequest.class); + }); + + Map payload = spi.buildQueuePayload(withShopCategories); + + @SuppressWarnings("unchecked") + Map data = (Map) payload.get("data"); + assertThat(data.get("shopCategoryNames")) + .as("店内分类 label 原样透传(客户端按行 shopCategorys/shopCategoryPath 等值过滤)") + .isEqualTo(List.of("工作制服", "拉丁舞服")); + assertThat(data.get("shopCategoryIds")) + .as("店内分类 id 原样透传(行级填充形状未取证,双键同发任一命中即命中)") + .isEqualTo(List.of("1024347567", "1024347572")); + } + @Test void 建单载荷缺失按SPI语义返回异常路径而非空载荷() { FileTaskEntity broken = task(); diff --git a/frontend-vue/src/pages/jd/JdCategoryCascader.vue b/frontend-vue/src/pages/jd/JdCategoryCascader.vue deleted file mode 100644 index 41e375aa9..000000000 --- a/frontend-vue/src/pages/jd/JdCategoryCascader.vue +++ /dev/null @@ -1,458 +0,0 @@ - - - - - diff --git a/frontend-vue/src/pages/jd/JdCollectTab.vue b/frontend-vue/src/pages/jd/JdCollectTab.vue index b4ef373fe..978d69a46 100644 --- a/frontend-vue/src/pages/jd/JdCollectTab.vue +++ b/frontend-vue/src/pages/jd/JdCollectTab.vue @@ -7,14 +7,10 @@ import { activateJdCollectTask, createJdCollectTask, deleteJdCollectTask, - fetchJdCollectCategories, fetchJdCollectDashboard, - fetchJdCollectGroups, fetchJdCollectHistory, fetchJdCollectTaskProgressBatch, interruptJdCollectTask, - type JdCollectCategoryVo, - type JdCollectGroupVo, type JdCollectHistoryItemVo, type JdListTab, } from '@/shared/api/types/modules/jd-collect' @@ -25,14 +21,16 @@ import { userNotice } from '@/shared/utils/user-notice' import { formatDateTime } from '@/shared/utils/datetime' import { useLiveTaskBoard } from '@/shared/composables/useLiveTaskBoard' import NotificationBell from '@/shared/components/NotificationBell.vue' -import JdCategoryCascader from './JdCategoryCascader.vue' +import { JD_SHOP_CATEGORY_SNAPSHOT, type JdShopCategory } from './jd-shop-category.ts' /** 京东「获取店铺数据」(v1.5):一键建单 → 推送本机客户端 → 右侧任务面板实时进度。 * * 四个真源与四条边界(照 v1.4 已落地的采集契约与外观专利任务面板骨架,不另造流程): * 1. 建单走后端 `/api/jd-collect/tasks`(通道恒 LOCAL,服务端落 PENDING);可选多选采集 - * 类目(京麦末级类目名,`categoryPaths`)——空=全店采集,选中值随建单进 request_json、 - * 随推送/兜底拉取进客户端,客户端按行 categoryPath 等值过滤(三处同键契约); + * 分类(京麦「店内分类」快照,`shopCategoryNames`/`shopCategoryIds` 双键)——空=全店 + * 采集,选中值随建单进 request_json、随推送/兜底拉取进客户端,客户端按行 + * shopCategorys/shopCategoryPath/groupId 等值过滤、任一键命中即命中(三处同键契约; + * 2026-11-16 类目级联按客户口径「类目不需要只要分类」下线,categoryPaths 仅历史行兼容); * 2. 建单成功把 `jd-shop-collect-run` 载荷推进本机客户端队列——只建单不推送会让任务 * 卡在 PENDING 等兜底拉取(v1.4 Phase 6.1 P0-1 的教训);推送失败不回滚建单; * 3. 进度只读服务端:任务状态 + 合并写游标里的 itemsReceived/total。`total` 缺失时 @@ -40,8 +38,9 @@ import JdCategoryCascader from './JdCategoryCascader.vue' * 4. 失败/中断任务「重试/继续」走通用原位复位(铁律 26,保留已收分片与断点游标), * 复位后页面重新激活并推队列——同一份输入不再多出好几行结果。 * - * 2026-11-16 客户口径「管理员弄了多少店铺分类 普通账户都能看到」:左面板加只读「店铺分类」 - * 块(GET /api/jd-collect/groups,管理员在后管京东数据库维护);「商品上架」落地后消费同一端点。 + * 2026-11-16 客户口径「管理员弄了多少店铺分类 普通账户都能看到」落点改为本多选块: + * 客户的参照系是京麦后台的「店内分类」(getShopCategoryList 快照),不再是后管平台分组 + * (平台分组接口从本页下线,分组数据面归京东数据库与商品上架)。 */ /** 页面不再让用户填店铺名:店铺名称由客户端从京麦后台读,建单先按此占位记录。 */ @@ -56,46 +55,31 @@ const submitting = ref(false) const errorMessage = ref('') const successMessage = ref('') -// ---- 采集类目(可选,多选;空=全店采集)---- -/** 选项集=公共库已落库 category_path 全集(/api/jd-collect/categories 现算)。 - * 拉取失败不阻塞建单(不选类目=全店采集),只把空态文案打出来。 */ -const categoryOptions = ref([]) -const categoryOptionsLoaded = ref(false) -const selectedCategories = ref([]) +// ---- 采集分类(可选,多选;空=全店采集)---- +/** 选项集=京麦「店内分类」快照(getShopCategoryList,2026-11-16 真机取证 9 个; + * 京麦侧改分类后按取证路重抓,见 jd-shop-category.ts 头注释——快照不会自动过期告警)。 */ +const shopCategoryOptions = JD_SHOP_CATEGORY_SNAPSHOT +const selectedShopCategories = ref([]) -async function loadCategoryOptions() { - if (categoryOptionsLoaded.value) return - try { - categoryOptions.value = await fetchJdCollectCategories() - } catch (err) { - // 选项是锦上添花:拉不到就保持空态文案,不把「全店采集」这条主路堵死。 - // 静默 catch 棘轮口径:console + ElMessage(界面上看得见),不算静默。 - console.error('[jd-collect] 类目选项拉取失败', err) - ElMessage.warning('类目选项加载失败,本次可先不选类目(全店采集)') - } finally { - categoryOptionsLoaded.value = true - } +function toggleShopCategory(category: JdShopCategory) { + const hit = selectedShopCategories.value.find((item) => item.value === category.value) + selectedShopCategories.value = hit + ? selectedShopCategories.value.filter((item) => item.value !== category.value) + : [...selectedShopCategories.value, category] } +function clearShopCategories() { + selectedShopCategories.value = [] +} + +/** 建单/推送载荷的选中值:label 与 id 双键同发(行级填充形状未取证,任一键命中即命中)。 */ +const selectedShopCategoryNames = computed(() => selectedShopCategories.value.map((item) => item.label)) +const selectedShopCategoryIds = computed(() => selectedShopCategories.value.map((item) => item.value)) + function uidForStorage() { return typeof window !== 'undefined' ? window.localStorage.getItem('uid') || '0' : '0' } -// ---- 店铺分类(管理员在后管「京东数据库」维护,本页只读展示;2026-11-16 客户口径 -// 「管理员弄了多少店铺分类 普通账户都能看到」——普通账号在「获取店铺数据」页就能看到 -// 分类全集与各组商品数。分类的增删改仍只在后管;「商品上架」落地后消费同一端点。)---- -const groupList = ref([]) - -async function loadGroups() { - try { - groupList.value = await fetchJdCollectGroups() - } catch (err) { - // 分类只是展示项:拉不到就保持空态文案,不把采集主路堵死(同 loadCategoryOptions 口径)。 - console.error('[jd-collect] 店铺分类拉取失败', err) - ElMessage.warning('店铺分类加载失败,不影响采集') - } -} - // ---- 实时任务面板(与外观专利共用 useLiveTaskBoard 骨架;京东无结果文件,无下载层)---- const board = useLiveTaskBoard({ scope: 'jd-collect', @@ -267,7 +251,7 @@ async function retryTaskRecord(item: JdCollectHistoryItemVo | null | undefined) if (!activateError) { await pushToClientQueue(taskId, item?.shopName || DEFAULT_SHOP_NAME, (item?.listTabs?.length ? item.listTabs : DEFAULT_TABS) as JdListTab[], - item?.categoryPaths ?? []) + item?.shopCategoryNames ?? [], item?.shopCategoryIds ?? []) } board.addPollingTask(taskId) await refreshBoard() @@ -306,13 +290,14 @@ async function activateTask(id: number): Promise { } /** 建单成功后推送本机队列;返回 null 表示环境无队列能力(浏览器预览),返回 string 表示失败原因。 - * categoryPaths 是建单时选的采集类目(重试/继续从历史行同源带回)——推送载荷与建单请求体、 - * 客户端兜底拉取(request_json)三处同键,缺一处客户端就按全店采集跑。 */ + * shopCategoryNames/Ids 是建单时选的京麦店内分类(重试/继续从历史行同源带回)——推送载荷 + * 与建单请求体、客户端兜底拉取(request_json)三处同键,缺一处客户端就按全店采集跑。 */ async function pushToClientQueue( id: number, shop: string, tabs: JdListTab[], - categoryPaths: string[] = [], + shopCategoryNames: string[] = [], + shopCategoryIds: string[] = [], ): Promise { const api = getPywebviewApi() if (!api?.enqueue_json) { @@ -321,7 +306,7 @@ async function pushToClientQueue( const payload = { type: 'jd-shop-collect-run', ts: Date.now(), - data: { taskId: id, shopName: shop, listTabs: tabs, maxProducts: 0, categoryPaths }, + data: { taskId: id, shopName: shop, listTabs: tabs, maxProducts: 0, shopCategoryNames, shopCategoryIds }, } const pushResult = await api.enqueue_json(payload) if (pushResult?.success) { @@ -343,9 +328,10 @@ async function startCollect() { submitting.value = true const shop = DEFAULT_SHOP_NAME const tabs = DEFAULT_TABS - const categories = [...selectedCategories.value] + const shopNames = [...selectedShopCategoryNames.value] + const shopIds = [...selectedShopCategoryIds.value] try { - const vo = await createJdCollectTask(shop, tabs, 0, categories) + const vo = await createJdCollectTask(shop, tabs, 0, [], shopNames, shopIds) board.addPollingTask(vo.taskId) let pushNote = '' const activateError = await activateTask(vo.taskId) @@ -355,7 +341,7 @@ async function startCollect() { pushNote = activateError } else { try { - const pushError = await pushToClientQueue(vo.taskId, shop, tabs, categories) + const pushError = await pushToClientQueue(vo.taskId, shop, tabs, shopNames, shopIds) if (pushError) pushNote = pushError } catch (pushErr) { // 推送自身异常不回滚建单:任务可由服务端兜底拉取认领。 @@ -366,8 +352,8 @@ async function startCollect() { if (pushNote) { errorMessage.value = pushNote } else { - successMessage.value = categories.length - ? `任务已创建(只采 ${categories.length} 个类目)并推送给本机客户端,进度显示在右侧任务区` + successMessage.value = shopNames.length + ? `任务已创建(只采 ${shopNames.length} 个分类)并推送给本机客户端,进度显示在右侧任务区` : '任务已创建并推送给本机客户端,进度显示在右侧任务区' } await Promise.all([board.loadDashboard(), board.loadHistory({ force: true })]) @@ -385,8 +371,6 @@ onMounted(async () => { await Promise.all([ board.loadDashboard().catch(() => undefined), board.loadHistory().catch(() => undefined), - loadCategoryOptions(), - loadGroups(), ]) board.seedRunningTasksFromHistory() board.seedPendingFileTasksFromHistory() @@ -428,34 +412,29 @@ onUnmounted(() => {