From 8b4f7a3a6b7c435d132685506533c4ead1529170 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 01:10:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(jd):=20=E9=87=87=E9=9B=86=E5=BB=BA?=
=?UTF-8?q?=E5=8D=95=E6=94=AF=E6=8C=81=E6=8C=89=E4=BA=AC=E4=B8=9C=E7=B1=BB?=
=?UTF-8?q?=E7=9B=AE=E5=9C=88=E8=8C=83=E5=9B=B4=EF=BC=88=E5=A4=9A=E9=80=89?=
=?UTF-8?q?=E6=9C=AB=E7=BA=A7=E7=B1=BB=E7=9B=AE=EF=BC=8C=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E7=AB=AF=E6=8C=89=20categoryPath=20=E7=AD=89=E5=80=BC=E8=BF=87?=
=?UTF-8?q?=E6=BB=A4=EF=BC=89=E2=80=94=E2=80=94JdCollectTaskCreateRequest?=
=?UTF-8?q?=20=E5=8A=A0=20categoryPaths=EF=BC=88null/=E7=A9=BA=3D=E5=85=A8?=
=?UTF-8?q?=E5=BA=97=E9=87=87=E9=9B=86=EF=BC=8C=E7=8E=B0=E8=A1=8C=E4=B8=BA?=
=?UTF-8?q?=E4=B8=8D=E5=8F=98=EF=BC=89=EF=BC=8Cvalidate=20=E5=BD=92?=
=?UTF-8?q?=E4=B8=80=E5=8C=96=E5=86=99=E5=9B=9E=E8=AF=B7=E6=B1=82=E4=BD=93?=
=?UTF-8?q?=E5=86=8D=E8=BF=9B=20request=5Fjson=EF=BC=88trim/=E5=8E=BB?=
=?UTF-8?q?=E7=A9=BA/=E4=BF=9D=E5=BA=8F=E5=8E=BB=E9=87=8D=EF=BC=8C?=
=?UTF-8?q?=E4=B8=8A=E9=99=90=2050=20=E4=B8=AA/=E5=8D=95=E5=90=8D=20100=20?=
=?UTF-8?q?=E5=AD=97=EF=BC=8C=E8=B6=85=E9=99=90=E5=BD=93=E5=9C=BA=E7=82=B9?=
=?UTF-8?q?=E5=90=8D=E6=8B=92=EF=BC=89=EF=BC=9BJdTaskPullSpiImpl.buildQueu?=
=?UTF-8?q?ePayload=20=E8=BD=BD=E8=8D=B7=E5=8A=A0=20categoryPaths=20?=
=?UTF-8?q?=E9=94=AE=EF=BC=88=E7=BC=BA=E7=9C=81=E7=A9=BA=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=EF=BC=8C=E9=94=AE=E9=9B=86=E7=A8=B3=E5=AE=9A=EF=BC=8C=E5=85=9C?=
=?UTF-8?q?=E5=BA=95=E6=8B=89=E5=8F=96=E4=B8=8E=E9=A1=B5=E9=9D=A2=E6=8E=A8?=
=?UTF-8?q?=E9=80=81=E5=90=8C=E6=BA=90=EF=BC=89=EF=BC=9BJdCollectBoardServ?=
=?UTF-8?q?ice=20=E5=8E=86=E5=8F=B2=E8=A1=8C=E5=90=8C=E6=BA=90=E5=B8=A6?=
=?UTF-8?q?=E5=9B=9E=20categoryPaths=EF=BC=88=E9=87=8D=E8=AF=95/=E7=BB=A7?=
=?UTF-8?q?=E7=BB=AD=E4=BB=8E=E5=8E=86=E5=8F=B2=E8=A1=8C=E9=87=8D=E5=BB=BA?=
=?UTF-8?q?=E6=8E=A8=E9=80=81=E8=BD=BD=E8=8D=B7=E4=B8=8D=E4=B8=A2=E7=B1=BB?=
=?UTF-8?q?=E7=9B=AE=EF=BC=89=EF=BC=9BJdCollectController=20=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=20GET=20/api/jd-collect/categories=20=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E5=9F=9F=E7=B1=BB=E7=9B=AE=E4=B8=8B=E6=8B=89=E7=AB=AF?=
=?UTF-8?q?=E7=82=B9=EF=BC=88requireOwnershipUserId=20fail-closed=EF=BC=8C?=
=?UTF-8?q?=E5=A4=8D=E7=94=A8=20JdProductQueryService.categories(null)=20?=
=?UTF-8?q?=E5=85=AC=E5=85=B1=E5=BA=93=E5=85=A8=E9=87=8F=E5=8F=A3=E5=BE=84?=
=?UTF-8?q?=EF=BC=8CSQL=20=E9=9B=B6=E6=96=B0=E5=A2=9E=EF=BC=9B=E4=BB=8E?=
=?UTF-8?q?=E6=9C=AA=E9=87=87=E9=9B=86=E7=9A=84=E5=BA=97=E9=93=BA=E7=B1=BB?=
=?UTF-8?q?=E7=9B=AE=E4=B8=8D=E5=9C=A8=E9=9B=86=E5=86=85=EF=BC=8C=E5=85=88?=
=?UTF-8?q?=E5=85=A8=E5=BA=97=E9=87=87=E4=B8=80=E6=AC=A1=E5=8D=B3=E6=9C=89?=
=?UTF-8?q?=EF=BC=89=E3=80=82=E5=88=A4=E6=8D=AE=EF=BC=9AJdCollectTaskServi?=
=?UTF-8?q?ceTest=20+3=EF=BC=88=E5=BD=92=E4=B8=80=E5=8C=96=E8=90=BD=20requ?=
=?UTF-8?q?estJson/=E8=B6=85=E4=B8=8A=E9=99=90=E6=8B=92/=E5=85=A8=E7=A9=BA?=
=?UTF-8?q?=E7=99=BD=E8=A7=86=E4=B8=BA=E4=B8=8D=E8=BF=87=E6=BB=A4=EF=BC=89?=
=?UTF-8?q?=E3=80=81JdTaskPullSpiImplTest=20=E9=94=AE=E9=9B=86=E6=96=AD?=
=?UTF-8?q?=E8=A8=80=E5=8A=A0=20categoryPaths+=E9=80=8F=E4=BC=A0=E7=94=A8?=
=?UTF-8?q?=E4=BE=8B=E3=80=81JdCollectBoardServiceTest=20=E5=8E=86?=
=?UTF-8?q?=E5=8F=B2=E8=A1=8C=E5=B8=A6=E5=9B=9E=E6=96=AD=E8=A8=80=EF=BC=9B?=
=?UTF-8?q?=E4=B8=89=E6=94=AF=E6=B5=8B=E8=AF=95=E7=B1=BB=2016=20=E4=BE=8B?=
=?UTF-8?q?=E5=85=A8=E7=BB=BF=EF=BC=8Cmvn=20-o=20test-compile=20=E9=9B=B6?=
=?UTF-8?q?=E9=94=99=E3=80=82=E5=AE=A2=E6=88=B7=E7=AB=AF=E8=AF=BB=E5=8F=82?=
=?UTF-8?q?/=E8=BF=87=E6=BB=A4=E4=B8=8E=E7=94=A8=E6=88=B7=E7=AB=AF?=
=?UTF-8?q?=E5=BB=BA=E5=8D=95=E9=A1=B5=E5=8F=A6=E7=AC=94=EF=BC=88=E5=A4=9A?=
=?UTF-8?q?=E4=BB=93=E8=BE=B9=E7=95=8C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jd/controller/JdCollectController.java | 16 ++++++
.../model/dto/JdCollectTaskCreateRequest.java | 7 +++
.../jd/model/vo/JdCollectHistoryItemVo.java | 4 ++
.../jd/service/JdCollectBoardService.java | 5 +-
.../jd/service/JdCollectTaskService.java | 40 +++++++++++++
.../modules/jd/service/JdTaskPullSpiImpl.java | 14 +++--
.../jd/service/JdCollectBoardServiceTest.java | 5 +-
.../jd/service/JdCollectTaskServiceTest.java | 57 +++++++++++++++++++
.../jd/service/JdTaskPullSpiImplTest.java | 29 +++++++++-
9 files changed, 168 insertions(+), 9 deletions(-)
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 bbee98acc..af9113980 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
@@ -12,8 +12,10 @@ import com.nanri.aiimage.modules.jd.model.vo.JdCollectProgressVo;
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.service.JdCollectBoardService;
import com.nanri.aiimage.modules.jd.service.JdCollectTaskService;
+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;
import com.nanri.aiimage.modules.task.model.vo.TaskHeartbeatVo;
@@ -36,6 +38,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
/**
* 京东店铺采集任务面(v1.4 Phase 2,蓝图 §3.2)。
*
@@ -55,11 +59,23 @@ public class JdCollectController {
private final JdCollectTaskService collectTaskService;
private final JdCollectBoardService boardService;
private final JdResultIngestService ingestService;
+ private final JdProductQueryService jdProductQueryService;
private final TaskHeartbeatService taskHeartbeatService;
private final TaskHeartbeatPositionService taskHeartbeatPositionService;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final AdminAuthSupport adminAuthSupport;
+ @GetMapping("/categories")
+ @Operation(summary = "采集类目下拉数据源", description = "建单页类目多选面板的选项集:公共库已落库行"
+ + " DISTINCT 的 category_path(京麦末级类目名)+ 行数,按类目名排序。与后管京东数据库"
+ + "同一条 SQL(JdProductQueryService.categories),公共库无公司维度——传 null 全量口径。"
+ + "边界:从未采集过的店铺/新类目不在集内(先全店采一次即有),页面选项空态不阻塞建单。")
+ public ApiResponse 页面推送缺失(只建单没推送 / 推送前关页面 / 纯浏览器打开)时任务会停在 PENDING,
* {@code TaskClientPullService} 认领后由本实现组装可直接入队的载荷。{@code data} 的键集
* 与客户端 {@code jd_base.process_task} 的读取契约同键({@code taskId / shopName /
- * listTabs / maxProducts},{@code QUEUE_TYPE} 与客户端 {@code amazon.jd.jd_base.QUEUE_TYPE}
- * 同值 {@code jd-shop-collect-run})——两处任意一处漂移,兜底拉下来的任务客户端不识别。> categories(HttpServletRequest httpRequest) {
+ // 登录用户即可读(公共库口径):解析不出会话身份就 401(fail-closed,与建单同口径)。
+ adminAuthSupport.requireOwnershipUserId(httpRequest, null);
+ return ApiResponse.success(jdProductQueryService.categories(null));
+ }
+
@GetMapping("/dashboard")
@Operation(summary = "查询京东采集任务总览", description = "当前用户的运行中、成功、失败任务数。"
+ "任务面板统计卡数据源,页面进入时请求一次即可,不需要持续轮询。")
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 816e630d9..6c88fe476 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
@@ -26,4 +26,11 @@ public class JdCollectTaskCreateRequest {
/** 采集范围上限(商品数);0/缺省=不设上限,采完整 Tab。 */
private Integer maxProducts;
+
+ /**
+ * 要采集的京麦末级类目名(多选,客户端按行 {@code categoryPath} 等值过滤,只对命中商品
+ * 开详情采集);null/空=全店采集。服务端建单口归一化(trim/去空/去重)后写进
+ * {@code request_json},与派发载荷、客户端过滤同源。
+ */
+ private List
shopName/listTabs/maxProducts 从建单载荷({@code request_json})回读,与页面推送 * 同源;载荷解析失败按 SPI 语义返回 null(调用方会把任务标失败并回写原因),不静默出空载荷。
@@ -45,8 +47,12 @@ public class JdTaskPullSpiImpl implements ClientTaskPullSpi { data.put("shopName", create.getShopName()); data.put("listTabs", create.getListTabs()); data.put("maxProducts", create.getMaxProducts()); - log.info("[jd-collect] 兜底载荷已组装 taskId={} shopName={} tabs={}", - task.getId(), create.getShopName(), create.getListTabs()); + // 缺省放空列表(不是 null):键集稳定,客户端读空集合=不过滤,语义与缺键一致。 + data.put("categoryPaths", create.getCategoryPaths() == null + ? List.of() : create.getCategoryPaths()); + log.info("[jd-collect] 兜底载荷已组装 taskId={} shopName={} tabs={} categories={}", + task.getId(), create.getShopName(), create.getListTabs(), + create.getCategoryPaths() == null ? 0 : create.getCategoryPaths().size()); return Map.of("type", QUEUE_TYPE, "data", data); } } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdCollectBoardServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdCollectBoardServiceTest.java index a0b824ae9..8ea1c0abe 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdCollectBoardServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdCollectBoardServiceTest.java @@ -84,7 +84,7 @@ class JdCollectBoardServiceTest { task.setStatus(status); task.setSuccessFileCount(0); task.setRequestJson("{\"userId\":" + userId + ",\"shopName\":\"花屿巷旗舰店\"," - + "\"listTabs\":[\"ONSALE\"],\"maxProducts\":0}"); + + "\"listTabs\":[\"ONSALE\"],\"maxProducts\":0,\"categoryPaths\":[\"女装\",\"男装\"]}"); task.setCreatedAt(LocalDateTime.of(2026, 11, 15, 10, 0)); task.setUpdatedAt(LocalDateTime.of(2026, 11, 15, 10, 1)); return task; @@ -132,6 +132,9 @@ class JdCollectBoardServiceTest { assertThat(vo.getItems().get(0).getTaskId()).isEqualTo(34398L); JdCollectHistoryItemVo first = vo.getItems().get(0); assertThat(first.getShopName()).as("店铺名来自建单载荷").isEqualTo("花屿巷旗舰店"); + assertThat(first.getCategoryPaths()) + .as("类目随建单载荷同源带回(重试/继续从历史行重建推送载荷用)") + .containsExactly("女装", "男装"); assertThat(first.getRowCount()).as("行数只来自 biz_jd_product 计数").isEqualTo(120); assertThat(first.getItemsReceived()).isEqualTo(120); assertThat(first.getTotal()).isEqualTo(300); 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 67dac99e5..bee59808e 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 @@ -105,4 +105,61 @@ class JdCollectTaskServiceTest { .hasMessageContaining("ONSALE/OFFSALE"); verify(fileTaskMapper, never()).insert(any(FileTaskEntity.class)); } + + @Test + void 类目多选归一化后落requestJson() throws Exception { + when(fileTaskMapper.insert(any(FileTaskEntity.class))).thenAnswer(invocation -> { + invocation.getArgument(0, FileTaskEntity.class).setId(33891L); + return 1; + }); + JdCollectTaskCreateRequest request = validRequest(); + // List.of 不收 null:空白元素/重复项用 Arrays.asList 喂(建单页不会发这些形状, + // 这里钉的是服务端归一化的兜底)。 + request.setCategoryPaths(new java.util.ArrayList<>(java.util.Arrays.asList( + " 女装 ", "男装", "女装", " "))); + + service.createTask(request, "device-abc"); + + ArgumentCaptor