fix(jd-collect): 补「激活」这一步——页面先 PENDING->RUNNING 再推客户端队列,否则分片全被拒
真机 task 34399 实录:页面建完单直接推客户端,任务仍是 PENDING,JdResultIngestService 只收 RUNNING 的分片、心跳对非 RUNNING 回 alive=false,客户端第一个分片被「任务不在运行中(PENDING),回传被拒」后当场收手,采集白跑一轮。相似ASIN/货源/外观专利/数据采集四条链都有同名 activate 入口,京东这条在建单入口漏了。
This commit is contained in:
+15
@@ -61,6 +61,21 @@ public class JdCollectController {
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/{taskId}/activate")
|
||||
@Operation(summary = "激活京东采集任务", description = "页面把 jd-shop-collect-run 载荷推给本机客户端前调用:"
|
||||
+ "PENDING→RUNNING 条件更新。漏掉这一步,客户端的第一个分片会被「任务不在运行中(PENDING)」"
|
||||
+ "拒收、心跳回 alive=false 要求客户端收手,采集白跑一轮(2026-11-14 真机实录)。")
|
||||
public ApiResponse<Void> activate(
|
||||
@Parameter(description = "任务 ID", required = true, example = "34398")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "任务所属用户 ID;省略时取当前登录身份", required = false, example = "1")
|
||||
@RequestParam(value = "user_id", required = false) Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
collectTaskService.activateTask(taskId,
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, userId));
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
@GetMapping("/tasks/{taskId}/progress")
|
||||
@Operation(summary = "查询京东采集进度", description = "用户端「获取店铺数据」进度条数据源:"
|
||||
+ "任务状态 + 已回传商品数 + 列表 total(客户端抓首页时写入游标) + 当前页/Tab + 已收批次数。"
|
||||
|
||||
+35
@@ -48,6 +48,7 @@ public class JdCollectTaskService {
|
||||
public static final String MODULE_TYPE = CollectRoutingProperties.MODULE_JD_SHOP_COLLECT;
|
||||
|
||||
private static final String STATUS_PENDING = com.nanri.aiimage.common.task.TaskStatuses.FileTask.PENDING;
|
||||
private static final String STATUS_RUNNING = com.nanri.aiimage.common.task.TaskStatuses.FileTask.RUNNING;
|
||||
|
||||
/** 京麦商品列表 Tab 词表(与 V193 list_tab 列同词表)。 */
|
||||
private static final Set<String> VALID_LIST_TABS = Set.of("ONSALE", "OFFSALE");
|
||||
@@ -97,6 +98,40 @@ public class JdCollectTaskService {
|
||||
return vo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 激活任务(PENDING→RUNNING)——页面把载荷推给本机客户端<b>之前</b>调用。
|
||||
*
|
||||
* <p>为什么必须有这一步(2026-11-14 真机实录):`JdResultIngestService` 只接受 RUNNING
|
||||
* 任务的分片,心跳对非 RUNNING 一律回 `alive=false`;页面建完单直接推客户端时任务还是
|
||||
* PENDING ⇒ 第一个分片被拒(「任务不在运行中(PENDING)」)、心跳要求客户端收手,
|
||||
* 采集白跑一轮。相似ASIN/货源/外观专利/上架四条链都有同名 activate 入口,京东这条漏了。
|
||||
*
|
||||
* <p>只允许 PENDING→RUNNING(条件更新):与客户端「兜底拉取」的原子认领互斥,
|
||||
* 谁先翻转谁执行,页面与客户端不会重复跑同一单。
|
||||
*/
|
||||
public void activateTask(Long taskId, Long userId) {
|
||||
FileTaskEntity task = fileTaskMapper.selectById(taskId);
|
||||
// 归属谓词走公共出口(TaskLifecycleDebtRatchetTest 棘轮只许降:新增手写遍数即红)。
|
||||
if (task == null || !TaskFinalizeSupport.belongsToModule(MODULE_TYPE, task.getModuleType())
|
||||
|| (userId != null && task.getUserId() != null && !Objects.equals(userId, task.getUserId()))) {
|
||||
throw new BusinessException("任务不存在");
|
||||
}
|
||||
int updated = fileTaskMapper.update(null,
|
||||
new com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<FileTaskEntity>()
|
||||
.eq(FileTaskEntity::getId, taskId)
|
||||
.eq(FileTaskEntity::getStatus, STATUS_PENDING)
|
||||
.set(FileTaskEntity::getStatus, STATUS_RUNNING)
|
||||
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now()));
|
||||
if (updated == 0) {
|
||||
FileTaskEntity latest = fileTaskMapper.selectById(taskId);
|
||||
if (latest != null && STATUS_RUNNING.equals(latest.getStatus())) {
|
||||
throw new BusinessException("任务已在执行中(可能已由客户端自动接管),无需重复启动");
|
||||
}
|
||||
throw new BusinessException("任务已结束");
|
||||
}
|
||||
log.info("[jd-collect] 已激活(PENDING→RUNNING) taskId={} userId={}", taskId, task.getUserId());
|
||||
}
|
||||
|
||||
private void validate(JdCollectTaskCreateRequest request) {
|
||||
if (request.getUserId() == null || request.getUserId() <= 0) {
|
||||
throw new BusinessException("user_id 不合法");
|
||||
|
||||
+4
-1
@@ -100,7 +100,10 @@ class RequestSuppliedIdentityOutletTest {
|
||||
// 130 而不是 129:2026-11-14 v1.4 Phase 2 新增 JdCollectController POST /api/jd-collect/tasks,
|
||||
// JdCollectTaskCreateRequest 带 userId 字段(DTO 形),先过 requireOwnershipUserId(fail-closed
|
||||
// 401,uid 不由请求体说了算)再落建单——覆盖面变大,不是放宽分母。
|
||||
assertThat(scan.boundWrite()).as("取请求身份且已接出口的写类 handler 数").isEqualTo(130);
|
||||
// 131 而不是 130:2026-11-14 真机补口 JdCollectController POST /api/jd-collect/tasks/{taskId}/activate
|
||||
// (PENDING→RUNNING;漏掉这一步客户端分片全被「任务不在运行中」拒收),@RequestParam("user_id") 先过
|
||||
// requireOwnershipUserId——同样是覆盖面变大。
|
||||
assertThat(scan.boundWrite()).as("取请求身份且已接出口的写类 handler 数").isEqualTo(131);
|
||||
// 64 而不是 63:2026-10-29 随本地采集开关恢复 GET /tasks/{taskId}/queue-payload,
|
||||
// 该 handler 同时接上 resolveOwnershipUserId(不是放宽分母)。
|
||||
// 65 而不是 64:2026-11-14 v1.4 新增 JdCollectController GET /api/jd-collect/tasks/{taskId}/progress
|
||||
|
||||
+142
@@ -0,0 +1,142 @@
|
||||
package com.nanri.aiimage.modules.jd.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.isNull;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 京东采集 activate 契约(2026-11-14 真机实录补口)。
|
||||
*
|
||||
* <p>现场:页面建完单直接推客户端,任务还是 PENDING ⇒ 客户端第一个分片被「任务不在运行中
|
||||
* (PENDING),回传被拒」、心跳回 {@code alive=false} 要求客户端收手,采集白跑一轮
|
||||
* (task 34399)。相似ASIN/货源/外观专利/数据采集四条链都有同名 activate 入口,京东这条漏了。
|
||||
*
|
||||
* <p>判据两件:① 只允许 PENDING→RUNNING 的条件更新(与客户端「兜底拉取」的原子认领互斥,
|
||||
* 谁先翻转谁执行,页面与客户端不会重复跑同一单);② 已结束的任务不能被复活,
|
||||
* 别的模块 / 别的用户的任务一律拒。
|
||||
*/
|
||||
class JdCollectActivateGuardTest {
|
||||
|
||||
private static final long USER_ID = 1095L;
|
||||
private static final long TASK_ID = 34398L;
|
||||
|
||||
private final FileTaskMapper fileTaskMapper = mock(FileTaskMapper.class);
|
||||
private JdCollectTaskService service;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
// LambdaWrapper 需要实体列缓存,单测无 Spring/MyBatis 上下文,手动初始化
|
||||
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), FileTaskEntity.class);
|
||||
service = new JdCollectTaskService(fileTaskMapper, mock(TaskScopeStateMapper.class), new ObjectMapper());
|
||||
}
|
||||
|
||||
@Test
|
||||
void PENDING任务激活成功且条件更新限定PENDING() {
|
||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task("PENDING"));
|
||||
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
|
||||
|
||||
service.activateTask(TASK_ID, USER_ID);
|
||||
|
||||
ArgumentCaptor<Wrapper<FileTaskEntity>> captor = wrapperCaptor();
|
||||
verify(fileTaskMapper).update(isNull(), captor.capture());
|
||||
Map<String, Object> params = paramsOf(captor.getValue());
|
||||
assertTrue(params.containsValue("PENDING"), "条件更新的谓词必须限定 PENDING");
|
||||
assertTrue(params.containsValue("RUNNING"), "条件更新必须写入 RUNNING");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 已被客户端领走时拒绝重复启动() {
|
||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task("RUNNING"));
|
||||
|
||||
BusinessException error = assertThrows(BusinessException.class,
|
||||
() -> service.activateTask(TASK_ID, USER_ID));
|
||||
|
||||
assertTrue(error.getMessage().contains("无需重复启动"),
|
||||
"错误信息应说明任务已在执行中:" + error.getMessage());
|
||||
// 只有一次条件更新,且谓词限定 PENDING —— 已被客户端认领(RUNNING)的行不可能被再翻一次
|
||||
ArgumentCaptor<Wrapper<FileTaskEntity>> captor = wrapperCaptor();
|
||||
verify(fileTaskMapper).update(isNull(), captor.capture());
|
||||
assertTrue(paramsOf(captor.getValue()).containsValue("PENDING"),
|
||||
"条件更新必须限定 PENDING,否则已认领的任务会被重复执行");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 已结束的任务不能被复活() {
|
||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task("SUCCESS"));
|
||||
|
||||
BusinessException error = assertThrows(BusinessException.class,
|
||||
() -> service.activateTask(TASK_ID, USER_ID));
|
||||
|
||||
assertEquals("任务已结束", error.getMessage());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 非本用户的任务被拒且不碰状态() {
|
||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task("PENDING"));
|
||||
|
||||
assertThrows(BusinessException.class, () -> service.activateTask(TASK_ID, USER_ID + 1));
|
||||
verify(fileTaskMapper, never()).update(isNull(), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 非京东模块的任务被拒且不碰状态() {
|
||||
FileTaskEntity other = task("PENDING");
|
||||
other.setModuleType("SIMILAR_ASIN");
|
||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(other);
|
||||
|
||||
BusinessException error = assertThrows(BusinessException.class,
|
||||
() -> service.activateTask(TASK_ID, USER_ID));
|
||||
|
||||
assertEquals("任务不存在", error.getMessage());
|
||||
verify(fileTaskMapper, never()).update(isNull(), any());
|
||||
}
|
||||
|
||||
private static FileTaskEntity task(String status) {
|
||||
FileTaskEntity task = new FileTaskEntity();
|
||||
task.setId(TASK_ID);
|
||||
task.setModuleType(JdCollectTaskService.MODULE_TYPE);
|
||||
task.setTaskNo("JD_SHOP_COLLECT-34398");
|
||||
task.setUserId(USER_ID);
|
||||
task.setStatus(status);
|
||||
return task;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static ArgumentCaptor<Wrapper<FileTaskEntity>> wrapperCaptor() {
|
||||
return ArgumentCaptor.forClass(Wrapper.class);
|
||||
}
|
||||
|
||||
/** 读取 wrapper 参数容器:MyBatis-Plus 在生成 SQL 片段时才填充,故先触发一次。 */
|
||||
@SuppressWarnings("unchecked")
|
||||
private static Map<String, Object> paramsOf(Wrapper<FileTaskEntity> wrapper) {
|
||||
wrapper.getSqlSegment();
|
||||
((LambdaUpdateWrapper<FileTaskEntity>) wrapper).getSqlSet();
|
||||
Map<String, Object> params = (Map<String, Object>) ReflectionTestUtils.getField(wrapper, "paramNameValuePairs");
|
||||
assertNotNull(params, "wrapper 参数容器字段名可能已变化(paramNameValuePairs)");
|
||||
return params;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user