fix(phase-6.1): CR 六项修复——派发链三件套/登记顺序/判死口凭据化/脏时间可读/UPDATE 段摘死列

This commit is contained in:
2026-11-14 13:53:03 +08:00
parent edeffc26c4
commit 796ec2130f
10 changed files with 346 additions and 32 deletions
@@ -352,7 +352,12 @@ class CatchSilenceRatchetTest {
// `JdProductQueryService.writeExportWorkbook`:SXSSF 落盘 `catch Exception` →
// BusinessException「导出京东数据库失败,请稍后重试」(RETHROW +1,与 11-11 外观专利导出同款)。
// 本批复核办法:单跑实测 total 1090、notRethrow 614、logOnly 194、empty 56(EMPTY 一格没涨)。
static final int STRICT_TOTAL = 1090;
// 11-14 Phase 6.1 CR 修复抬 1090 -> 1091,一枚逐处记名:
// `JdResultIngestService.parseJdTime`:DateTimeParseException → BusinessException
// 「京东时间格式不识别(应为 yyyy-MM-dd HH:mm:ss): <原文>」(RETHROW)。误差方向:
// 客户端回传脏时间戳之前直接 DateTimeParseException 裸抛 = 回传口 500 裸堆栈(P1-3);
// 改成吞掉置 null = 登记时间被悄悄抹掉。
static final int STRICT_TOTAL = 1091;
/**
* 重抛型 catch 的**下限**(不是上限):本轮把两处吞异常改成重抛之后实测 388。
* 这一格只能涨不能跌——它是"异常会往外走"的总量,把它钉成"只许减"就等于拦着别人修吞异常。
@@ -35,11 +35,13 @@ import java.util.List;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.when;
@@ -175,7 +177,7 @@ class JdProductSyncServiceTest {
stubHappyPath();
JdIngestChunkVo vo = service.submitChunk(TASK_ID,
chunk(item("10036442942137", "艺考形体服女"), item("10036442942138", "艺考形体服男")));
chunk(item("10036442942137", "艺考形体服女"), item("10036442942138", "艺考形体服男")), true);
assertThat(vo.isAccept()).isTrue();
assertThat(vo.getUpserted()).isEqualTo(2);
@@ -203,8 +205,8 @@ class JdProductSyncServiceTest {
stubHappyPath();
JdIngestChunkRequest request = chunk(item("10036442942137", "艺考形体服女"));
service.submitChunk(TASK_ID, request);
service.submitChunk(TASK_ID, request);
service.submitChunk(TASK_ID, request, true);
service.submitChunk(TASK_ID, request, true);
verify(jdProductMapper, times(2)).upsertBatch(anyList());
verify(jdProductMapper, never()).delete(any(Wrapper.class));
@@ -228,8 +230,8 @@ class JdProductSyncServiceTest {
String xml = Files.readString(Path.of("src/main/resources/mapper/jd/JdProductMapper.xml"));
assertThat(xml).contains("synced_at = CURRENT_TIMESTAMP");
service.submitChunk(TASK_ID, chunk(item("10036442942137", "艺考形体服女")));
service.submitChunk(TASK_ID, chunk(item("10036442942137", "艺考形体服女")));
service.submitChunk(TASK_ID, chunk(item("10036442942137", "艺考形体服女")), true);
service.submitChunk(TASK_ID, chunk(item("10036442942137", "艺考形体服女")), true);
verify(jdProductMapper, times(2)).upsertBatch(anyList());
}
@@ -239,7 +241,7 @@ class JdProductSyncServiceTest {
lenient().when(fileTaskMapper.selectById(TASK_ID)).thenReturn(runningTask());
lenient().when(adminUserMapper.selectById(USER_ID)).thenReturn(owner(null));
JdIngestChunkVo vo = service.submitChunk(TASK_ID, chunk(item("10036442942137", "艺考形体服女")));
JdIngestChunkVo vo = service.submitChunk(TASK_ID, chunk(item("10036442942137", "艺考形体服女")), true);
assertThat(vo.isAccept()).isFalse();
assertThat(vo.getMessage()).contains("归属");
@@ -253,7 +255,7 @@ class JdProductSyncServiceTest {
request.setItems(List.of());
request.setCursor(null);
JdIngestChunkVo vo = service.submitChunk(TASK_ID, request);
JdIngestChunkVo vo = service.submitChunk(TASK_ID, request, true);
assertThat(vo.isAccept()).isTrue();
assertThat(vo.getUpserted()).isZero();
@@ -296,7 +298,7 @@ class JdProductSyncServiceTest {
JdIngestChunkRequest request = chunk(item("10036442942137", "艺考形体服女"));
request.setIsEnd(true);
service.submitChunk(TASK_ID, request);
service.submitChunk(TASK_ID, request, true);
verify(fileTaskMapper).update(isNull(), any(LambdaUpdateWrapper.class));
verify(taskProgressSnapshotService).markTerminal(eq(TASK_ID), eq("JD_SHOP_COLLECT"), eq("SUCCESS"), anyString());
@@ -311,11 +313,76 @@ class JdProductSyncServiceTest {
request.setBatchId("JD20261114-0002");
request.setError("京麦未登录,请重新登录");
JdIngestChunkVo vo = service.submitChunk(TASK_ID, request);
JdIngestChunkVo vo = service.submitChunk(TASK_ID, request, true);
assertThat(vo.isAccept()).isFalse();
assertThat(vo.getMessage()).contains("京麦");
verify(jdProductMapper, never()).upsertBatch(anyList());
verify(jdStaleTaskService).terminalizeOnJdLoginFatal(any(FileTaskEntity.class), anyString());
}
// ---------- Phase 6.1(CR 修复回归) ----------
@Test
void 图片登记必须晚于商品行upsert_P0_2顺序判据() {
// P0-2(CR):registerTaskImages 按 companyId+taskId+productCode 查商品行,
// 登记若先于 upsertBatch 执行,首采行必然不存在 → 图片登记被 100% 跳过。
// InOrder 验证 mock 调用顺序是真判据:登记先于落库即红。
stubHappyPath();
when(jdProductImageIngestService.registerTaskImages(
any(), eq(COMPANY_ID), anyString(), any())).thenReturn(3);
service.submitChunk(TASK_ID,
chunk(item("10036442942137", "艺考形体服女"), item("10036442942138", "艺考形体服男")), true);
org.mockito.InOrder order = inOrder(jdProductMapper, jdProductImageIngestService);
order.verify(jdProductMapper).upsertBatch(anyList());
order.verify(jdProductImageIngestService, times(2)).registerTaskImages(
any(), eq(COMPANY_ID), anyString(), any());
assertThat(jdProductImageIngestService).isNotNull();
}
@Test
void 匿名失败上报拒绝判死_P1_2判据() {
// P1-2(CR):error 上报是唯一能触发整单判死的入口,匿名(trusted=false)一律拒绝,
// 不碰任务状态——防枚举 taskId 即可判死任意 RUNNING 京东任务。
lenient().when(fileTaskMapper.selectById(TASK_ID)).thenReturn(runningTask());
JdIngestChunkRequest request = new JdIngestChunkRequest();
request.setBatchId("JD20261114-0003");
request.setError("京麦未登录,请重新登录");
JdIngestChunkVo vo = service.submitChunk(TASK_ID, request, false);
assertThat(vo.isAccept()).isFalse();
assertThat(vo.getMessage()).contains("凭据");
verify(jdStaleTaskService, never()).terminalizeOnJdLoginFatal(any(FileTaskEntity.class), anyString());
verify(fileTaskMapper, never()).update(isNull(), any(LambdaUpdateWrapper.class));
verify(taskProgressSnapshotService, never()).markTerminal(any(), any(), any(), any());
}
@Test
void 脏时间可读拒批不裸500_P1_3判据() {
assertThatThrownBy(() -> JdResultIngestService.parseJdTime("2026/11/13 14:06"))
.isInstanceOf(com.nanri.aiimage.common.exception.BusinessException.class)
.hasMessageContaining("京东时间格式不识别")
.hasMessageContaining("2026/11/13 14:06");
// 正常与 ISO T 分隔仍解析
assertThat(JdResultIngestService.parseJdTime("2026-11-13 14:06:07"))
.isEqualTo(LocalDateTime.of(2026, 11, 13, 14, 6, 7));
assertThat(JdResultIngestService.parseJdTime("2026-11-13T14:06:07"))
.isEqualTo(LocalDateTime.of(2026, 11, 13, 14, 6, 7));
assertThat(JdResultIngestService.parseJdTime(" ")).isNull();
}
@Test
void upsertBatch更新段不写image_count与main_image_url_P1_1绊线() throws Exception {
// P1-1(CR):buildRow 恒 0/恒 null,写进 UPDATE 段会把登记链刷新的真实计数抹回 0。
String xml = Files.readString(Path.of("src/main/resources/mapper/jd/JdProductMapper.xml"));
String updateSegment = xml.substring(xml.indexOf("ON DUPLICATE KEY UPDATE"));
assertThat(updateSegment)
.as("UPDATE 段不得写 image_count / main_image_url(登记侧按表实数刷,死列不随更新)")
.doesNotContain("image_count = VALUES")
.doesNotContain("main_image_url = VALUES");
assertThat(updateSegment).contains("synced_at = CURRENT_TIMESTAMP");
}
}
@@ -0,0 +1,113 @@
package com.nanri.aiimage.modules.jd.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.modules.jd.model.dto.JdCollectTaskCreateRequest;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.junit.jupiter.MockitoExtension;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
/**
* v1.4 Phase 6.1 修 P0-1(派发链断头)的判据:兜底拉取 SPI 的载荷形状与白名单接线。
*
* <p>三个 P0 之一的实证形状:建单后没有任何派发路径(页面不推送、白名单不含 JD、无 SPI 实现),
* 任务永久停在 PENDING(submitChunk 只认 RUNNING,判活只扫 RUNNING)。本类钉住修复后的三件:
* ① SPI 载荷 type 与客户端 {@code jd_base.QUEUE_TYPE} 同值;② data 键集与客户端
* {@code process_task} 读取契约同键;③ 白名单默认值含 {@code JD_SHOP_COLLECT}(源码绊线)。
*/
@ExtendWith(MockitoExtension.class)
class JdTaskPullSpiImplTest {
@Mock
private JdCollectTaskService collectTaskService;
@Spy
private ObjectMapper objectMapper = new ObjectMapper();
@InjectMocks
private JdTaskPullSpiImpl spi;
private FileTaskEntity task() {
FileTaskEntity task = new FileTaskEntity();
task.setId(33890L);
task.setUserId(7L);
task.setModuleType("JD_SHOP_COLLECT");
task.setRequestJson("{\"userId\":7,\"shopName\":\"测试旗舰店\",\"listTabs\":[\"ONSALE\",\"OFFSALE\"],\"maxProducts\":0}");
return task;
}
@Test
void 载荷type与客户端QUEUE_TYPE同值且data键集与客户端契约同键() {
when(collectTaskService.readCreateRequest(any(FileTaskEntity.class)))
.thenAnswer(invocation -> {
FileTaskEntity t = invocation.getArgument(0);
return new ObjectMapper().readValue(t.getRequestJson(), JdCollectTaskCreateRequest.class);
});
Map<String, Object> payload = spi.buildQueuePayload(task());
assertThat(payload.get("type"))
.as("type 与客户端 amazon/jd/jd_base.py 的 QUEUE_TYPE 逐字同值")
.isEqualTo("jd-shop-collect-run");
@SuppressWarnings("unchecked")
Map<String, Object> data = (Map<String, Object>) payload.get("data");
assertThat(data.get("taskId")).isEqualTo(33890L);
assertThat(data.get("shopName")).isEqualTo("测试旗舰店");
assertThat(data.get("listTabs")).isEqualTo(List.of("ONSALE", "OFFSALE"));
assertThat(data.get("maxProducts")).isEqualTo(0);
// 客户端 process_task 只读这四键:多键无害,缺键即空跑——所以逐键钉
assertThat(data.keySet())
.as("data 键集与客户端 jd_base.process_task 读取契约同键(taskId/shopName/listTabs/maxProducts)")
.containsExactlyInAnyOrder("taskId", "shopName", "listTabs", "maxProducts");
}
@Test
void 建单载荷缺失按SPI语义返回异常路径而非空载荷() {
FileTaskEntity broken = task();
broken.setRequestJson("{}");
when(collectTaskService.readCreateRequest(any(FileTaskEntity.class)))
.thenThrow(new com.nanri.aiimage.common.exception.BusinessException("任务载荷缺少 shopName,无法定位店铺"));
assertThatThrownBy(() -> spi.buildQueuePayload(broken))
.isInstanceOf(com.nanri.aiimage.common.exception.BusinessException.class);
}
@Test
void 白名单默认值含JD_SHOP_COLLECT_源码绊线() throws Exception {
// P0-1 的第三件:TaskClientPullService 按 module-types 白名单筛任务——白名单不含
// JD_SHOP_COLLECT 时 SPI 装载了也不会被走到(判据读 application.yml,改默认值必须同轮改这里)。
String yml = Files.readString(Path.of("src/main/resources/application.yml"));
int pullStart = yml.indexOf("client-task-pull:");
assertThat(pullStart).as("application.yml 缺 client-task-pull 段").isGreaterThan(0);
// 段落边界 = 下一个顶层键(零缩进行);文件别处也会出现 min-pending-minutes 等
// 字样,按词定位终点会把起点切到终点之后(本测试首跑即踩)。
String rest = yml.substring(pullStart);
int segEnd = rest.length();
for (String line : rest.split("\n")) {
if (line.contains("client-task-pull:")) {
continue;
}
if (!line.isEmpty() && !Character.isWhitespace(line.charAt(0))) {
segEnd = rest.indexOf(line);
break;
}
}
String segment = rest.substring(0, segEnd);
assertThat(segment)
.as("client-task-pull 白名单默认值必须含 JD_SHOP_COLLECT(P0-1:兜底拉取是 LOCAL 任务的唯一出路)")
.contains("JD_SHOP_COLLECT");
}
}