From 3bccc9769820ede7d75a71f307ecc94503515c3e 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 03:18:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(jd):=20=E6=99=AE=E9=80=9A=E8=B4=A6?=
=?UTF-8?q?=E5=8F=B7=E5=9C=A8=E4=BA=AC=E4=B8=9C=E4=BE=A7=E5=8F=AF=E8=A7=81?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=BA=97=E9=93=BA=E5=88=86=E7=B1=BB?=
=?UTF-8?q?=EF=BC=882026-11-16=20=E5=AE=A2=E6=88=B7=E5=8F=A3=E5=BE=84?=
=?UTF-8?q?=E3=80=8C=E7=AE=A1=E7=90=86=E5=91=98=E5=BC=84=E4=BA=86=E5=A4=9A?=
=?UTF-8?q?=E5=B0=91=E5=BA=97=E9=93=BA=E5=88=86=E7=B1=BB=20=E6=99=AE?=
=?UTF-8?q?=E9=80=9A=E8=B4=A6=E6=88=B7=E9=83=BD=E8=83=BD=E7=9C=8B=E5=88=B0?=
=?UTF-8?q?=E3=80=8D=EF=BC=89=E2=80=94=E2=80=94=E6=9C=8D=E5=8A=A1=E7=AB=AF?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=20GET=20/api/jd-collect/groups=20=E5=8F=AA?=
=?UTF-8?q?=E8=AF=BB=E7=AB=AF=E7=82=B9=EF=BC=88=E5=A4=8D=E7=94=A8=20JdProd?=
=?UTF-8?q?uctGroupService.list=EF=BC=8CrequireOwnershipUserId=20fail-clos?=
=?UTF-8?q?ed=EF=BC=8C=E4=B8=8E=20categories=20=E5=90=8C=E5=BD=A2=EF=BC=8C?=
=?UTF-8?q?=E6=97=A0=E5=85=AC=E5=8F=B8=E7=BB=B4=E5=BA=A6=EF=BC=9A=E5=88=86?=
=?UTF-8?q?=E7=B1=BB=E6=98=AF=E5=B9=B3=E5=8F=B0=E7=BA=A7=E5=85=A8=E9=9B=86?=
=?UTF-8?q?=EF=BC=89=EF=BC=9B=E7=94=A8=E6=88=B7=E7=AB=AF=E3=80=8C=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96=E5=BA=97=E9=93=BA=E6=95=B0=E6=8D=AE=E3=80=8D=E9=A1=B5?=
=?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=8D=B3=E6=8B=89=E5=8F=96=EF=BC=8C=E5=8F=AA?=
=?UTF-8?q?=E8=AF=BB=20chips=20=E5=B1=95=E7=A4=BA=E5=88=86=E7=B1=BB?=
=?UTF-8?q?=E5=90=8D=EF=BC=8B=E5=95=86=E5=93=81=E6=95=B0=EF=BC=88title=20?=
=?UTF-8?q?=E5=B8=A6=E6=98=8E=E7=BB=86=EF=BC=89=EF=BC=8C=E7=A9=BA=E6=80=81?=
=?UTF-8?q?=E7=82=B9=E5=90=8D=E3=80=8C=E7=AE=A1=E7=90=86=E5=91=98=E5=9C=A8?=
=?UTF-8?q?=E4=BA=AC=E4=B8=9C=E6=95=B0=E6=8D=AE=E5=BA=93=E2=86=92=E5=BA=97?=
=?UTF-8?q?=E9=93=BA=E5=88=86=E7=B1=BB=E5=BB=BA=E3=80=8D=EF=BC=8C=E6=8B=89?=
=?UTF-8?q?=E5=8F=96=E5=A4=B1=E8=B4=A5=20warning=20=E4=B8=8D=E9=98=BB?=
=?UTF-8?q?=E5=A1=9E=E9=87=87=E9=9B=86=E4=B8=BB=E8=B7=AF=EF=BC=88catch=20?=
=?UTF-8?q?=E6=A3=98=E8=BD=AE=20318=E2=86=92319=20=E9=80=90=E6=9D=A1?=
=?UTF-8?q?=E7=82=B9=E5=90=8D=EF=BC=89=EF=BC=9Bendpoints=20=E5=86=BB?=
=?UTF-8?q?=E7=BB=93=E5=BF=AB=E7=85=A7=E9=9A=8F=E5=B8=A6=20dated=20?=
=?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=80=82=E5=88=A4=E6=8D=AE=EF=BC=9Amvn=20-o?=
=?UTF-8?q?=20test=20JdCollectGroupsEndpointTest=202/2=EF=BC=9Bvue-tsc=20r?=
=?UTF-8?q?c=3D0=EF=BC=9Bnode=20--test=20=E5=AE=9A=E5=90=91=2021/21?=
=?UTF-8?q?=EF=BC=9Bvitest=20mount=2011/11=EF=BC=88+2=EF=BC=9Achips=20?=
=?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=B8=A6=20count/=E7=A9=BA=E6=80=81=E6=8F=90?=
=?UTF-8?q?=E7=A4=BA=EF=BC=89=EF=BC=9Bfast=20=E9=97=B8=E9=97=A8=20overall?=
=?UTF-8?q?=3Dpass=20=E5=9B=9B=E9=9D=A2=E7=BB=BF=EF=BC=9BJdCollectTab.vue?=
=?UTF-8?q?=20791<800=20=E6=A3=98=E8=BD=AE=E7=BA=BF=E3=80=82=E5=95=86?=
=?UTF-8?q?=E5=93=81=E4=B8=8A=E6=9E=B6=E4=BE=A7=E8=90=BD=E5=9C=B0=E6=97=B6?=
=?UTF-8?q?=E6=B6=88=E8=B4=B9=E5=90=8C=E4=B8=80=E7=AB=AF=E7=82=B9=EF=BC=88?=
=?UTF-8?q?=E6=AC=A0=E8=B4=A6=E5=85=A5=20ops=20BACKLOG=20B113=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jd/controller/JdCollectController.java | 15 +++
.../JdCollectGroupsEndpointTest.java | 91 +++++++++++++++++++
frontend-vue/src/pages/jd/JdCollectTab.vue | 54 +++++++++++
frontend-vue/src/shared/api/endpoints.ts | 2 +
.../shared/api/types/modules/jd-collect.ts | 20 ++++
.../tests/catch-silence-ratchet.test.ts | 6 +-
frontend-vue/tests/endpoints.test.ts | 3 +
frontend-vue/tests/jd-collect-tab.test.ts | 25 +++++
.../mount/jd-collect-progress.mount.test.ts | 35 +++++++
9 files changed, 250 insertions(+), 1 deletion(-)
create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/jd/controller/JdCollectGroupsEndpointTest.java
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java
index af9113980..a6f9bfe9b 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java
@@ -13,8 +13,10 @@ import com.nanri.aiimage.modules.jd.model.vo.JdCollectTaskBatchVo;
import com.nanri.aiimage.modules.jd.model.vo.JdCollectTaskVo;
import com.nanri.aiimage.modules.jd.model.vo.JdIngestChunkVo;
import com.nanri.aiimage.modules.jd.model.vo.JdProductCategoryVo;
+import com.nanri.aiimage.modules.jd.model.vo.JdProductGroupVo;
import com.nanri.aiimage.modules.jd.service.JdCollectBoardService;
import com.nanri.aiimage.modules.jd.service.JdCollectTaskService;
+import com.nanri.aiimage.modules.jd.service.JdProductGroupService;
import com.nanri.aiimage.modules.jd.service.JdProductQueryService;
import com.nanri.aiimage.modules.jd.service.JdResultIngestService;
import com.nanri.aiimage.modules.task.model.dto.TaskHeartbeatRequest;
@@ -60,6 +62,7 @@ public class JdCollectController {
private final JdCollectBoardService boardService;
private final JdResultIngestService ingestService;
private final JdProductQueryService jdProductQueryService;
+ private final JdProductGroupService jdProductGroupService;
private final TaskHeartbeatService taskHeartbeatService;
private final TaskHeartbeatPositionService taskHeartbeatPositionService;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
@@ -76,6 +79,18 @@ public class JdCollectController {
return ApiResponse.success(jdProductQueryService.categories(null));
}
+ @GetMapping("/groups")
+ @Operation(summary = "店铺分类列表(用户侧只读)", description = "2026-11-16 客户口径「管理员弄了多少"
+ + "店铺分类 普通账户都能看到」:「获取店铺数据」页把管理员在后管京东数据库建的分类展示出来"
+ + "(含组内商品数),普通账号登录即可见。与后管分组管理同一条读出口(JdProductGroupService.list,"
+ + "分组 2026-11-15 起全平台一份、无公司维度);只读不写——分类的增删改仍只在后管。"
+ + "「商品上架」未落地(jd-publish 占位),上架界面落地时消费同一端点。")
+ public ApiResponse 「获取店铺数据」页把管理员在后管京东数据库建的分类展示给普通账号:GET /api/jd-collect/groups,
+ * 与 categories 端点同形(登录用户即可读、fail-closed 401;分组全平台一份、无公司维度)。
+ * 只读不写——分类的增删改仍只在后管 AdminJdProductGroupController。结构判据(照
+ * {@code AdminJdProductControllerTest} 双形态的第一半)+行为样本(200 信封装 list、鉴权先过)。> groups(HttpServletRequest httpRequest) {
+ // 登录用户即可读(公共库口径):解析不出会话身份就 401(fail-closed,与 categories 同口径)。
+ adminAuthSupport.requireOwnershipUserId(httpRequest, null);
+ return ApiResponse.success(jdProductGroupService.list());
+ }
+
@GetMapping("/dashboard")
@Operation(summary = "查询京东采集任务总览", description = "当前用户的运行中、成功、失败任务数。"
+ "任务面板统计卡数据源,页面进入时请求一次即可,不需要持续轮询。")
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/controller/JdCollectGroupsEndpointTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/controller/JdCollectGroupsEndpointTest.java
new file mode 100644
index 000000000..522bfaece
--- /dev/null
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/controller/JdCollectGroupsEndpointTest.java
@@ -0,0 +1,91 @@
+package com.nanri.aiimage.modules.jd.controller;
+
+import com.nanri.aiimage.common.api.ApiResponse;
+import com.nanri.aiimage.common.security.AdminAuthSupport;
+import com.nanri.aiimage.modules.jd.model.vo.JdProductGroupVo;
+import com.nanri.aiimage.modules.jd.service.JdCollectBoardService;
+import com.nanri.aiimage.modules.jd.service.JdCollectTaskService;
+import com.nanri.aiimage.modules.jd.service.JdProductGroupService;
+import com.nanri.aiimage.modules.jd.service.JdProductQueryService;
+import com.nanri.aiimage.modules.jd.service.JdResultIngestService;
+import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService;
+import com.nanri.aiimage.modules.task.service.TaskHeartbeatService;
+import com.nanri.aiimage.modules.task.service.TaskProgressOwnershipSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * 用户侧「店铺分类」只读端点(2026-11-16 客户口径「管理员弄了多少店铺分类 普通账户都能看到」)。
+ *
+ *
> response = controller.groups(request);
+
+ assertNotNull(response);
+ assertTrue(response.isSuccess(), "成功信封 success=true(B80-03:判据只认响应体,不认 HTTP 状态码)");
+ assertNotNull(response.getData());
+ assertEquals(1, response.getData().size());
+ assertEquals("ASSS", response.getData().get(0).getName());
+ assertEquals(20L, response.getData().get(0).getProductCount());
+ // 鉴权闸先行:解析不出会话身份就 401,读不到任何数据。
+ verify(authSupport).requireOwnershipUserId(same(request), isNull());
+ verify(groupService).list();
+ }
+}
diff --git a/frontend-vue/src/pages/jd/JdCollectTab.vue b/frontend-vue/src/pages/jd/JdCollectTab.vue
index 1fcd3afe7..8bde6660c 100644
--- a/frontend-vue/src/pages/jd/JdCollectTab.vue
+++ b/frontend-vue/src/pages/jd/JdCollectTab.vue
@@ -9,10 +9,12 @@ import {
deleteJdCollectTask,
fetchJdCollectCategories,
fetchJdCollectDashboard,
+ fetchJdCollectGroups,
fetchJdCollectHistory,
fetchJdCollectTaskProgressBatch,
interruptJdCollectTask,
type JdCollectCategoryVo,
+ type JdCollectGroupVo,
type JdCollectHistoryItemVo,
type JdListTab,
} from '@/shared/api/types/modules/jd-collect'
@@ -37,6 +39,9 @@ import JdCategoryCascader from './JdCategoryCascader.vue'
* 卡片只显示已采集行数,不编造百分比;
* 4. 失败/中断任务「重试/继续」走通用原位复位(铁律 26,保留已收分片与断点游标),
* 复位后页面重新激活并推队列——同一份输入不再多出好几行结果。
+ *
+ * 2026-11-16 客户口径「管理员弄了多少店铺分类 普通账户都能看到」:左面板加只读「店铺分类」
+ * 块(GET /api/jd-collect/groups,管理员在后管京东数据库维护);「商品上架」落地后消费同一端点。
*/
/** 页面不再让用户填店铺名:店铺名称由客户端从京麦后台读,建单先按此占位记录。 */
@@ -76,6 +81,21 @@ function uidForStorage() {
return typeof window !== 'undefined' ? window.localStorage.getItem('uid') || '0' : '0'
}
+// ---- 店铺分类(管理员在后管「京东数据库」维护,本页只读展示;2026-11-16 客户口径
+// 「管理员弄了多少店铺分类 普通账户都能看到」——普通账号在「获取店铺数据」页就能看到
+// 分类全集与各组商品数。分类的增删改仍只在后管;「商品上架」落地后消费同一端点。)----
+const groupList = ref
+ + {{ group.name }}({{ group.productCount }}) + +
++ 后台还没建店铺分类;管理员在「京东数据库 → 店铺分类」里建的会显示在这里。 +
+