feat(jd): 普通账号在京东侧可见管理员店铺分类(2026-11-16 客户口径「管理员弄了多少店铺分类 普通账户都能看到」)——服务端新增 GET /api/jd-collect/groups 只读端点(复用 JdProductGroupService.list,requireOwnershipUserId fail-closed,与 categories 同形,无公司维度:分类是平台级全集);用户端「获取店铺数据」页加载即拉取,只读 chips 展示分类名+商品数(title 带明细),空态点名「管理员在京东数据库→店铺分类建」,拉取失败 warning 不阻塞采集主路(catch 棘轮 318→319 逐条点名);endpoints 冻结快照随带 dated 追加。判据:mvn -o test JdCollectGroupsEndpointTest 2/2;vue-tsc rc=0;node --test 定向 21/21;vitest mount 11/11(+2:chips 渲染带 count/空态提示);fast 闸门 overall=pass 四面绿;JdCollectTab.vue 791<800 棘轮线。商品上架侧落地时消费同一端点(欠账入 ops BACKLOG B113)
This commit is contained in:
+15
@@ -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<List<JdProductGroupVo>> groups(HttpServletRequest httpRequest) {
|
||||
// 登录用户即可读(公共库口径):解析不出会话身份就 401(fail-closed,与 categories 同口径)。
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, null);
|
||||
return ApiResponse.success(jdProductGroupService.list());
|
||||
}
|
||||
|
||||
@GetMapping("/dashboard")
|
||||
@Operation(summary = "查询京东采集任务总览", description = "当前用户的运行中、成功、失败任务数。"
|
||||
+ "任务面板统计卡数据源,页面进入时请求一次即可,不需要持续轮询。")
|
||||
|
||||
+91
@@ -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 客户口径「管理员弄了多少店铺分类 普通账户都能看到」)。
|
||||
*
|
||||
* <p>「获取店铺数据」页把管理员在后管京东数据库建的分类展示给普通账号:GET /api/jd-collect/groups,
|
||||
* 与 categories 端点同形(登录用户即可读、fail-closed 401;分组全平台一份、无公司维度)。
|
||||
* 只读不写——分类的增删改仍只在后管 AdminJdProductGroupController。结构判据(照
|
||||
* {@code AdminJdProductControllerTest} 双形态的第一半)+行为样本(200 信封装 list、鉴权先过)。</p>
|
||||
*/
|
||||
class JdCollectGroupsEndpointTest {
|
||||
|
||||
private static final Path CONTROLLER = Path.of("").toAbsolutePath()
|
||||
.resolve("src/main/java/com/nanri/aiimage/modules/jd/controller/JdCollectController.java");
|
||||
|
||||
@Test
|
||||
void 结构判据_groups端点只读且复用分组服务公共口径() throws IOException {
|
||||
assertTrue(Files.exists(CONTROLLER), "控制器必须落在 " + CONTROLLER);
|
||||
String source = Files.readString(CONTROLLER);
|
||||
assertTrue(source.contains("@GetMapping(\"/groups\")"),
|
||||
"用户侧分类列表必须是 GET /groups(categories 同形)");
|
||||
assertTrue(source.contains("jdProductGroupService.list()"),
|
||||
"必须复用 JdProductGroupService.list()(与后管分组管理同一条读出口,不另造查询)");
|
||||
assertTrue(source.contains("adminAuthSupport.requireOwnershipUserId(httpRequest, null)"),
|
||||
"登录用户即可读但必须 fail-closed:解析不出会话身份就 401(与 categories 同口径)");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 行为样本_鉴权先过且200信封装分组全量() {
|
||||
JdProductGroupService groupService = mock(JdProductGroupService.class);
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
JdCollectController controller = new JdCollectController(
|
||||
mock(JdCollectTaskService.class),
|
||||
mock(JdCollectBoardService.class),
|
||||
mock(JdResultIngestService.class),
|
||||
mock(JdProductQueryService.class),
|
||||
groupService,
|
||||
mock(TaskHeartbeatService.class),
|
||||
mock(TaskHeartbeatPositionService.class),
|
||||
mock(TaskProgressOwnershipSupport.class),
|
||||
authSupport);
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
|
||||
JdProductGroupVo vo = new JdProductGroupVo();
|
||||
vo.setId(7L);
|
||||
vo.setName("ASSS");
|
||||
vo.setProductCount(20L);
|
||||
when(authSupport.requireOwnershipUserId(same(request), isNull())).thenReturn(1L);
|
||||
when(groupService.list()).thenReturn(List.of(vo));
|
||||
|
||||
ApiResponse<List<JdProductGroupVo>> 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();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user