feat(taskcenter): 13 个客户端任务创建入口记录 JWT 设备号

设备号只认 JWT 签名 claim(不接受客户端可控请求头),controller 读取、service
归一化落库;续跑任务由服务端发起,继承原任务设备号。品牌检测走独立
brand_crawl_tasks 表,同一口径。
This commit is contained in:
2026-09-28 22:33:53 +08:00
parent 0a7e1b9c01
commit fa59de52fb
40 changed files with 204 additions and 71 deletions
@@ -87,6 +87,14 @@ public class AdminAuthSupport {
}
}
/**
* 归一化设备标识(任务落库用):空白 → null(语义"未记录");否则 trim 后原样。
* 与 {@link #currentDeviceId(HttpServletRequest)} 的空串语义配套使用。
*/
public static String normalizeDeviceId(String deviceId) {
return deviceId == null || deviceId.isBlank() ? null : deviceId.trim();
}
/** 当前用户必须是管理员或超级管理员,否则抛 403。 */ public AdminUserEntity requireAdmin(HttpServletRequest request) {
AdminUserEntity user = requireUser(request);
String role = currentRole(user);
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.appearancepatent.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentParseRequest;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentParsedGroupPageDto;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentParsedPayloadDto;
@@ -14,6 +15,7 @@ import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskSe
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -45,11 +47,14 @@ public class AppearancePatentController {
private final AppearancePatentTaskService service;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final AdminAuthSupport adminAuthSupport;
@PostMapping("/parse")
@Operation(summary = "解析 Excel 并创建任务", description = "解析上传后的 Excel 文件,提取 id、ASIN、国家、URL、标题等字段。返回给前端的数据只包含整数 id 和 n_1 行;n_2、n_3 等子行会保存在 OSS 解析载荷中,用于最终结果补齐。创建后的任务状态为 PENDING,不会自动推送 Python。")
public ApiResponse<AppearancePatentParseVo> parse(@Valid @RequestBody AppearancePatentParseRequest request) {
return ApiResponse.success(service.parseAndCreateTask(request));
public ApiResponse<AppearancePatentParseVo> parse(@Valid @RequestBody AppearancePatentParseRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(service.parseAndCreateTask(request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@GetMapping("/tasks/{taskId}/parsed-payload")
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentExcelParser;
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
import com.nanri.aiimage.common.service.DistributedJobLockService;
@@ -149,7 +150,7 @@ public class AppearancePatentTaskService {
private final TaskProgressLightAssembler taskProgressLightAssembler;
private final UserApiSecretService userApiSecretService;
public AppearancePatentParseVo parseAndCreateTask(AppearancePatentParseRequest request) {
public AppearancePatentParseVo parseAndCreateTask(AppearancePatentParseRequest request, String deviceId) {
long startedAt = System.nanoTime();
if (request.getUserId() == null || request.getUserId() <= 0) {
throw new BusinessException("user_id 不合法");
@@ -204,6 +205,7 @@ public class AppearancePatentTaskService {
task.setFailedFileCount(0);
task.setCreatedBy("user:" + request.getUserId());
task.setUserId(request.getUserId());
task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
task.setCreatedAt(LocalDateTime.now());
task.setUpdatedAt(LocalDateTime.now());
try {
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.brand.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.brand.model.dto.BrandCrawlResultRequest;
import com.nanri.aiimage.modules.brand.model.dto.BrandTaskCreateRequest;
import com.nanri.aiimage.modules.brand.model.vo.BrandCrawlPayloadVo;
@@ -14,6 +15,7 @@ import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -39,6 +41,7 @@ import java.net.URI;
public class BrandTaskController {
private final BrandTaskService brandTaskService;
private final AdminAuthSupport adminAuthSupport;
@PostMapping("/tasks")
@Operation(
@@ -60,8 +63,10 @@ public class BrandTaskController {
})
public ApiResponse<BrandCrawlPayloadVo> createTask(
@Parameter(description = "用户 ID", required = true) @RequestParam Long userId,
@Valid @RequestBody BrandTaskCreateRequest request) {
return ApiResponse.success(brandTaskService.createTaskAndBuildPayload(userId, request));
@Valid @RequestBody BrandTaskCreateRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(brandTaskService.createTaskAndBuildPayload(userId, request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@PostMapping("/run")
@@ -71,8 +76,10 @@ public class BrandTaskController {
)
public ApiResponse<BrandCrawlPayloadVo> run(
@Parameter(description = "用户 ID", required = true) @RequestParam Long userId,
@Valid @RequestBody BrandTaskCreateRequest request) {
return ApiResponse.success(brandTaskService.createTaskAndBuildPayload(userId, request));
@Valid @RequestBody BrandTaskCreateRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(brandTaskService.createTaskAndBuildPayload(userId, request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@GetMapping("/tasks")
@@ -16,6 +16,8 @@ public class BrandCrawlTaskEntity {
private Long id;
private Long userId;
/** 创建任务的客户端设备(JWT 签名 deviceId claim,V138);历史任务为空。 */
private String deviceId;
private String filePaths;
private String status;
private Integer taskType;
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.config.BrandProgressProperties;
@@ -140,7 +141,7 @@ public class BrandTaskService {
private final TaskProgressSnapshotService taskProgressSnapshotService;
private final NotificationDispatchService notificationDispatchService;
public BrandTaskCreateVo createTask(Long userId, BrandTaskCreateRequest request) {
public BrandTaskCreateVo createTask(Long userId, BrandTaskCreateRequest request, String deviceId) {
if (userId == null || userId <= 0) {
throw new BusinessException("userId 不合法");
}
@@ -153,6 +154,7 @@ public class BrandTaskService {
BrandCrawlTaskEntity entity = new BrandCrawlTaskEntity();
entity.setUserId(userId);
entity.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
entity.setFilePaths(JSONUtil.toJsonStr(files));
entity.setStatus(STATUS_PENDING);
entity.setTaskType(taskType);
@@ -169,8 +171,8 @@ public class BrandTaskService {
return vo;
}
public BrandCrawlPayloadVo createTaskAndBuildPayload(Long userId, BrandTaskCreateRequest request) {
BrandTaskCreateVo created = createTask(userId, request);
public BrandCrawlPayloadVo createTaskAndBuildPayload(Long userId, BrandTaskCreateRequest request, String deviceId) {
BrandTaskCreateVo created = createTask(userId, request, deviceId);
return getCrawlPayload(created.getTaskId());
}
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.collectdata.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.collectdata.model.dto.CollectDataCountryPreferenceSaveRequest;
import com.nanri.aiimage.modules.collectdata.model.dto.CollectDataParseRequest;
import com.nanri.aiimage.modules.collectdata.model.dto.CollectDataSubmitResultRequest;
@@ -16,6 +17,7 @@ import com.nanri.aiimage.modules.collectdata.service.CollectDataService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -39,11 +41,14 @@ public class CollectDataController {
private final CollectDataService service;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final AdminAuthSupport adminAuthSupport;
@PostMapping("/parse")
@Operation(summary = "解析 Excel 并创建任务", description = "解析上传后的 Excel 文件,按行入库到 biz_collect_data_item,并保存任务筛选条件。任务初始状态为 PENDING。")
public ApiResponse<CollectDataParseVo> parse(@Valid @RequestBody CollectDataParseRequest request) {
return ApiResponse.success(service.parseAndCreateTask(request));
public ApiResponse<CollectDataParseVo> parse(@Valid @RequestBody CollectDataParseRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(service.parseAndCreateTask(request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@PostMapping("/tasks/{taskId}/activate")
@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessCodes;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.modules.collectdata.mapper.CollectDataCountryPrefMapper;
import com.nanri.aiimage.modules.collectdata.mapper.CollectDataItemMapper;
@@ -239,7 +240,7 @@ public class CollectDataService {
return new CollectDataParseLimits(resolveMaxSourceFileBytes(), resolveMaxParseRows(), resolveMaxChunkRows());
}
public CollectDataParseVo parseAndCreateTask(CollectDataParseRequest request) {
public CollectDataParseVo parseAndCreateTask(CollectDataParseRequest request, String deviceId) {
long startedAt = System.currentTimeMillis();
if (request == null || request.getUserId() == null || request.getUserId() <= 0) {
throw new BusinessException("user_id 不合法");
@@ -281,7 +282,7 @@ public class CollectDataService {
long parsedAt = System.currentTimeMillis();
String aggregateFilename = buildAggregateSourceFilenameLabel(sources);
PersistedParse persisted = transactionTemplate.execute(status ->
persistParsedTask(request, sources, taskType, filters, parsedRows, aggregateFilename));
persistParsedTask(request, sources, taskType, filters, parsedRows, aggregateFilename, deviceId));
if (persisted == null) {
throw new BusinessException("创建采集任务失败");
}
@@ -307,7 +308,8 @@ public class CollectDataService {
String taskType,
CollectDataFiltersDto filters,
List<ParsedRow> parsedRows,
String aggregateFilename) {
String aggregateFilename,
String deviceId) {
FileTaskEntity task = new FileTaskEntity();
task.setTaskNo(MODULE_TYPE + "-" + IdUtil.getSnowflakeNextIdStr());
task.setModuleType(MODULE_TYPE);
@@ -318,6 +320,7 @@ public class CollectDataService {
task.setFailedFileCount(0);
task.setCreatedBy("user:" + request.getUserId());
task.setUserId(request.getUserId());
task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
task.setCreatedAt(LocalDateTime.now());
task.setUpdatedAt(LocalDateTime.now());
try {
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.deletebrand.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.deletebrand.model.dto.DeleteBrandRunRequest;
import com.nanri.aiimage.modules.deletebrand.model.dto.DeleteBrandSubmitResultRequest;
import com.nanri.aiimage.modules.deletebrand.model.dto.DeleteBrandTaskBatchRequest;
@@ -17,6 +18,7 @@ import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -49,14 +51,17 @@ public class DeleteBrandRunController {
private final DeleteBrandRunService deleteBrandRunService;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final AdminAuthSupport adminAuthSupport;
@PostMapping("/run")
@Operation(summary = "执行删除品牌解析", description = "读取上传的删除品牌 Excel,按国家分组解析并在每个国家内按 ASIN 去重,返回完整 payload。")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "执行成功", content = @Content(schema = @Schema(implementation = DeleteBrandRunVo.class)))
})
public ApiResponse<DeleteBrandRunVo> run(@Valid @RequestBody DeleteBrandRunRequest request) {
return ApiResponse.success(deleteBrandRunService.run(request));
public ApiResponse<DeleteBrandRunVo> run(@Valid @RequestBody DeleteBrandRunRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(deleteBrandRunService.run(request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@GetMapping("/history")
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.config.DeleteBrandProgressProperties;
import com.nanri.aiimage.config.TaskPressureProperties;
@@ -135,7 +136,7 @@ public class DeleteBrandRunService {
|| ZiniaoShopIndexService.MATCH_STATUS_STALE.equals(status);
}
public DeleteBrandRunVo run(DeleteBrandRunRequest request) {
public DeleteBrandRunVo run(DeleteBrandRunRequest request, String deviceId) {
if (request.getUserId() == null || request.getUserId() <= 0) {
throw new BusinessException("user_id 不合法");
}
@@ -148,6 +149,7 @@ public class DeleteBrandRunService {
task.setSourceFileCount(request.getFiles().size());
task.setCreatedBy("user:" + request.getUserId());
task.setUserId(request.getUserId());
task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
task.setRequestJson(JSONUtil.toJsonStr(request));
task.setCreatedAt(LocalDateTime.now());
task.setUpdatedAt(LocalDateTime.now());
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.patroldelete.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.patroldelete.model.dto.PatrolDeleteConditionAddRequest;
import com.nanri.aiimage.modules.patroldelete.model.dto.PatrolDeleteCreateTaskRequest;
import com.nanri.aiimage.modules.patroldelete.model.dto.PatrolDeleteSubmitResultRequest;
@@ -23,6 +24,7 @@ import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.ExampleObject;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -58,6 +60,7 @@ public class PatrolDeleteController {
private final PatrolDeleteResolveService patrolDeleteResolveService;
private final PatrolDeleteTaskService patrolDeleteTaskService;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final AdminAuthSupport adminAuthSupport;
@GetMapping("/candidates")
@Operation(summary = "查询备选店铺列表", description = "返回当前用户在巡店删除模块中已保存的备选店铺。")
@@ -230,8 +233,10 @@ public class PatrolDeleteController {
]
}
""")))
@Valid @RequestBody PatrolDeleteCreateTaskRequest request) {
return ApiResponse.success(patrolDeleteTaskService.createTask(request));
@Valid @RequestBody PatrolDeleteCreateTaskRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(patrolDeleteTaskService.createTask(request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@PostMapping("/tasks/{taskId}/result")
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessCodes;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.config.TaskPressureProperties;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import com.nanri.aiimage.modules.patroldelete.model.dto.PatrolDeleteCartRatioDto;
@@ -279,7 +280,7 @@ public class PatrolDeleteTaskService {
}
@Transactional
public PatrolDeleteCreateTaskVo createTask(PatrolDeleteCreateTaskRequest request) {
public PatrolDeleteCreateTaskVo createTask(PatrolDeleteCreateTaskRequest request, String deviceId) {
validateUserId(request.getUserId());
if (request.getItems() == null || request.getItems().isEmpty()) {
throw new BusinessException("items 不能为空");
@@ -311,6 +312,7 @@ public class PatrolDeleteTaskService {
task.setFailedFileCount(0);
task.setCreatedBy("user:" + request.getUserId());
task.setUserId(request.getUserId());
task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
task.setCreatedAt(now);
task.setUpdatedAt(now);
fileTaskMapper.insert(task);
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.pricetrack.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.pricetrack.model.dto.PriceTrackCandidateAddRequest;
import com.nanri.aiimage.modules.pricetrack.model.dto.PriceTrackCountryPreferenceSaveRequest;
import com.nanri.aiimage.modules.pricetrack.model.dto.PriceTrackCreateTaskRequest;
@@ -30,6 +31,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -69,6 +71,7 @@ public class PriceTrackController {
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final PriceTrackLoopRunService priceTrackLoopRunService;
private final SkipPriceAsinService skipPriceAsinService;
private final AdminAuthSupport adminAuthSupport;
@GetMapping("/candidates")
@Operation(summary = "查询备选店铺列表", description = "返回当前用户在跟价模块中保存的备选店铺。")
@@ -188,8 +191,10 @@ public class PriceTrackController {
@PostMapping("/tasks")
@Operation(summary = "创建跟价任务", description = "落库 RUNNING 任务和各店铺占位结果,返回 taskId 和初始 items 快照。")
public ApiResponse<PriceTrackCreateTaskVo> createTask(@Valid @RequestBody PriceTrackCreateTaskRequest request) {
return ApiResponse.success(priceTrackTaskService.createTask(request));
public ApiResponse<PriceTrackCreateTaskVo> createTask(@Valid @RequestBody PriceTrackCreateTaskRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(priceTrackTaskService.createTask(request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@PostMapping("/tasks/{taskId}/dispatch-failed")
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessCodes;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.config.TaskPressureProperties;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
@@ -501,7 +502,7 @@ public class PriceTrackTaskService {
}
@Transactional
public PriceTrackCreateTaskVo createTask(PriceTrackCreateTaskRequest request) {
public PriceTrackCreateTaskVo createTask(PriceTrackCreateTaskRequest request, String deviceId) {
if (request.isStatusMode() == request.isAsinMode()) throw new BusinessException("跟价模式必须二选一");
if (request.isAsinMode() && (request.getAsinFiles() == null || request.getAsinFiles().isEmpty())) {
throw new BusinessException("自定义 ASIN 模式必须上传 ASIN 文件");
@@ -541,6 +542,7 @@ public class PriceTrackTaskService {
task.setFailedFileCount(0);
task.setCreatedBy("user:" + request.getUserId());
task.setUserId(request.getUserId());
task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
task.setCreatedAt(LocalDateTime.now());
task.setUpdatedAt(LocalDateTime.now());
fileTaskMapper.insert(task);
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.productrisk.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCandidateAddRequest;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCountryPreferenceSaveRequest;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCreateTaskRequest;
@@ -25,6 +26,7 @@ import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.ExampleObject;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -61,6 +63,7 @@ public class ProductRiskResolveController {
private final ProductRiskResolveService productRiskResolveService;
private final ProductRiskTaskService productRiskTaskService;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final AdminAuthSupport adminAuthSupport;
@GetMapping("/candidates")
@Operation(summary = "查询备选店铺列表", description = "返回当前用户在商品风险模块中已保存的备选店铺。")
@@ -135,8 +138,10 @@ public class ProductRiskResolveController {
@PostMapping("/tasks")
@Operation(summary = "创建商品风险处理任务", description = "落库 RUNNING 任务及各店占位结果,返回 taskId 与 items。")
public ApiResponse<ProductRiskCreateTaskVo> createTask(@Valid @RequestBody ProductRiskCreateTaskRequest request) {
return ApiResponse.success(productRiskTaskService.createTask(request));
public ApiResponse<ProductRiskCreateTaskVo> createTask(@Valid @RequestBody ProductRiskCreateTaskRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(productRiskTaskService.createTask(request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@DeleteMapping("/tasks/{taskId}")
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessCodes;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.config.TaskPressureProperties;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import com.nanri.aiimage.modules.productrisk.mapper.ProductRiskShopCandidateMapper;
@@ -520,7 +521,7 @@ public class ProductRiskTaskService {
}
@Transactional
public ProductRiskCreateTaskVo createTask(ProductRiskCreateTaskRequest request) {
public ProductRiskCreateTaskVo createTask(ProductRiskCreateTaskRequest request, String deviceId) {
if (request.getUserId() == null || request.getUserId() <= 0) {
throw new BusinessException("user_id 不合法");
}
@@ -548,6 +549,7 @@ public class ProductRiskTaskService {
task.setFailedFileCount(0);
task.setCreatedBy("user:" + request.getUserId());
task.setUserId(request.getUserId());
task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
task.setCreatedAt(LocalDateTime.now());
task.setUpdatedAt(LocalDateTime.now());
fileTaskMapper.insert(task);
@@ -42,8 +42,10 @@ public class PublishController {
@Operation(
summary = "匹配店铺、解析 Excel 并创建多文件批次任务",
description = "按文件名(去扩展名)先匹配已管理店铺,再查询紫鸟索引;解析每个非空 Sheet。源文件前五列表头必须依次为 id、ASIN、国家、品牌、价格,第六列及以后不解析;状态、同步状态、同步国家由 Python 回传并写入最终结果文件。匹配并解析成功的文件为 PENDING,失败文件为 FAILED;只要存在可处理文件,任务为 PENDING,否则任务为 FAILED。")
public ApiResponse<PublishParseVo> parse(@Valid @RequestBody PublishParseRequest request) {
return ApiResponse.success(publishTaskService.parseAndCreateTask(request));
public ApiResponse<PublishParseVo> parse(@Valid @RequestBody PublishParseRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(publishTaskService.parseAndCreateTask(request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@PostMapping("/tasks/{taskId}/activate")
@@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.config.InstanceMetadata;
import com.nanri.aiimage.modules.file.service.LocalFileStorageService;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
@@ -130,7 +131,7 @@ public class PublishTaskService {
@Value("${aiimage.publish.no-result-upload-timeout-minutes:180}")
private int noResultUploadTimeoutMinutes;
public PublishParseVo parseAndCreateTask(PublishParseRequest request) {
public PublishParseVo parseAndCreateTask(PublishParseRequest request, String deviceId) {
validateParseRequest(request);
List<PreparedFile> preparedFiles = new ArrayList<>();
Set<String> fileKeys = new LinkedHashSet<>();
@@ -141,7 +142,7 @@ public class PublishTaskService {
preparedFiles.add(prepareFile(source));
}
PersistedTask persisted = transactionTemplate.execute(status -> persistTask(request, preparedFiles));
PersistedTask persisted = transactionTemplate.execute(status -> persistTask(request, preparedFiles, deviceId));
if (persisted == null) {
throw new BusinessException("创建上架任务失败");
}
@@ -1005,7 +1006,7 @@ public class PublishTaskService {
taskFileJobService.enqueueAssembleResult(taskId, MODULE_TYPE, result.getId(), ownerScopeKey(taskId));
}
private PersistedTask persistTask(PublishParseRequest request, List<PreparedFile> preparedFiles) {
private PersistedTask persistTask(PublishParseRequest request, List<PreparedFile> preparedFiles, String deviceId) {
LocalDateTime now = LocalDateTime.now();
int failedFiles = (int) preparedFiles.stream().filter(file -> STATUS_FAILED.equals(file.status)).count();
int processableFiles = preparedFiles.size() - failedFiles;
@@ -1024,6 +1025,7 @@ public class PublishTaskService {
task.setErrorMessage(processableFiles > 0 ? null : "全部文件解析或店铺匹配失败");
task.setCreatedBy("user:" + request.getUserId());
task.setUserId(request.getUserId());
task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
task.setCreatedAt(now);
task.setUpdatedAt(now);
task.setFinishedAt(processableFiles > 0 ? null : now);
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.queryasin.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCandidateAddRequest;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskMatchShopsRequest;
import com.nanri.aiimage.common.model.vo.ProductRiskCandidateVo;
@@ -21,6 +22,7 @@ import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.ExampleObject;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -56,6 +58,7 @@ public class QueryAsinTaskController {
private final QueryAsinResolveService queryAsinResolveService;
private final QueryAsinTaskService queryAsinTaskService;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final AdminAuthSupport adminAuthSupport;
@GetMapping("/candidates")
@Operation(summary = "查询备选店铺列表", description = "返回当前用户在查询 ASIN 模块中已保存的备选店铺。")
@@ -191,8 +194,10 @@ public class QueryAsinTaskController {
]
}
""")))
@Valid @RequestBody QueryAsinCreateTaskRequest request) {
return ApiResponse.success(queryAsinTaskService.createTask(request));
@Valid @RequestBody QueryAsinCreateTaskRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(queryAsinTaskService.createTask(request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@PostMapping("/tasks/{taskId}/result")
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessCodes;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.config.TaskPressureProperties;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinAsinStatusDto;
@@ -279,7 +280,7 @@ public class QueryAsinTaskService {
}
@Transactional
public QueryAsinCreateTaskVo createTask(QueryAsinCreateTaskRequest request) {
public QueryAsinCreateTaskVo createTask(QueryAsinCreateTaskRequest request, String deviceId) {
validateUserId(request.getUserId());
if (request.getItems() == null || request.getItems().isEmpty()) {
throw new BusinessException("items 不能为空");
@@ -312,6 +313,7 @@ public class QueryAsinTaskService {
task.setFailedFileCount(0);
task.setCreatedBy("user:" + request.getUserId());
task.setUserId(request.getUserId());
task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
task.setCreatedAt(now);
task.setUpdatedAt(now);
fileTaskMapper.insert(task);
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.shopdatacrawl.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCandidateAddRequest;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCountryPreferenceSaveRequest;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskMatchShopsRequest;
@@ -23,6 +24,7 @@ import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.ExampleObject;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -49,6 +51,7 @@ public class ShopDataCrawlTaskController {
private final ShopDataCrawlResolveService resolveService;
private final ShopDataCrawlTaskService taskService;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final AdminAuthSupport adminAuthSupport;
@GetMapping("/candidates")
@Operation(
@@ -174,8 +177,10 @@ public class ShopDataCrawlTaskController {
description = "每次必须且只能提交一个已匹配店铺,并按 country_codes 的顺序抓取。任务创建后状态为 RUNNING,返回 taskId 和该店铺的初始结果项。",
responses = @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "创建成功"))
public ApiResponse<ShopDataCrawlCreateTaskVo> createTask(
@Valid @RequestBody ShopDataCrawlCreateTaskRequest request) {
return ApiResponse.success(taskService.createTask(request));
@Valid @RequestBody ShopDataCrawlCreateTaskRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(taskService.createTask(request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@PostMapping("/tasks/{taskId}/result")
@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessCodes;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.config.InstanceMetadata;
import com.nanri.aiimage.config.TaskPressureProperties;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
@@ -549,7 +550,7 @@ public class ShopDataCrawlTaskService {
}
@Transactional
public ShopDataCrawlCreateTaskVo createTask(ShopDataCrawlCreateTaskRequest request) {
public ShopDataCrawlCreateTaskVo createTask(ShopDataCrawlCreateTaskRequest request, String deviceId) {
validateUserId(request.getUserId());
if (request.getItems() == null || request.getItems().size() != 1) {
throw new BusinessException("items 必须且只能包含一个店铺");
@@ -584,6 +585,7 @@ public class ShopDataCrawlTaskService {
task.setFailedFileCount(0);
task.setCreatedBy("user:" + request.getUserId());
task.setUserId(request.getUserId());
task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
task.setCreatedAt(now);
task.setUpdatedAt(now);
fileTaskMapper.insert(task);
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.shopmatch.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCandidateAddRequest;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCountryPreferenceSaveRequest;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskMatchShopsRequest;
@@ -22,6 +23,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -56,6 +58,7 @@ public class ShopMatchController {
private final ShopMatchResolveService shopMatchResolveService;
private final ShopMatchTaskService shopMatchTaskService;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final AdminAuthSupport adminAuthSupport;
@GetMapping("/candidates")
@Operation(summary = "查询候选店铺", description = "返回当前用户在匹配店铺模块下保存的候选店铺列表。")
@@ -129,8 +132,10 @@ public class ShopMatchController {
@PostMapping("/tasks")
@Operation(summary = "创建匹配店铺任务", description = "创建任务与各店铺占位结果,支持立即执行或多时间点定时执行。")
public ApiResponse<ShopMatchCreateTaskVo> createTask(@Valid @RequestBody ShopMatchCreateTaskRequest request) {
return ApiResponse.success(shopMatchTaskService.createTask(request));
public ApiResponse<ShopMatchCreateTaskVo> createTask(@Valid @RequestBody ShopMatchCreateTaskRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(shopMatchTaskService.createTask(request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@DeleteMapping("/tasks/{taskId}")
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessCodes;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.config.TaskPressureProperties;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import com.nanri.aiimage.modules.productrisk.model.enums.ProductRiskCountryCode;
@@ -438,7 +439,7 @@ public class ShopMatchTaskService {
}
@Transactional
public ShopMatchCreateTaskVo createTask(ShopMatchCreateTaskRequest request) {
public ShopMatchCreateTaskVo createTask(ShopMatchCreateTaskRequest request, String deviceId) {
if (request.getUserId() == null || request.getUserId() <= 0) {
throw new BusinessException("user_id 不合法");
}
@@ -478,6 +479,7 @@ public class ShopMatchTaskService {
task.setFailedFileCount(0);
task.setCreatedBy("user:" + request.getUserId());
task.setUserId(request.getUserId());
task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
task.setCreatedAt(now);
task.setUpdatedAt(now);
task.setScheduledAt(scheduleTimes.isEmpty() ? null : scheduleTimes.get(0));
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.similarasin.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinFilterConditionAddRequest;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinParseRequest;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinParsedPayloadDto;
@@ -19,6 +20,7 @@ import com.nanri.aiimage.modules.task.service.TaskProgressOwnershipSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -50,6 +52,7 @@ public class SimilarAsinController {
private final SimilarAsinTaskService service;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final AdminAuthSupport adminAuthSupport;
@GetMapping("/filter-conditions")
@Operation(summary = "查询货源查询筛选条件")
@@ -82,8 +85,10 @@ public class SimilarAsinController {
summary = "解析 Excel 并创建任务",
description = "解析上传后的 Excel 文件,提取 id、ASIN、国家、URL、标题、SKU 等字段。返回给前端的数据同时包含全量有效行 items,以及按主数据块分组后的 groups,便于 Python 按组抓取后再回传。创建后的任务状态为 PENDING,不会自动推送 Python。"
)
public ApiResponse<SimilarAsinParseVo> parse(@Valid @RequestBody SimilarAsinParseRequest request) {
return ApiResponse.success(service.parseAndCreateTask(request));
public ApiResponse<SimilarAsinParseVo> parse(@Valid @RequestBody SimilarAsinParseRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(service.parseAndCreateTask(request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@GetMapping("/tasks/{taskId}/parsed-payload")
@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.util.FailedStatusRowFilter;
import com.nanri.aiimage.config.InstanceMetadata;
@@ -383,7 +384,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
filterConditionMapper.deleteById(id);
}
public SimilarAsinParseVo parseAndCreateTask(SimilarAsinParseRequest request) {
public SimilarAsinParseVo parseAndCreateTask(SimilarAsinParseRequest request, String deviceId) {
long startedAt = System.nanoTime();
if (request.getUserId() == null || request.getUserId() <= 0) {
throw new BusinessException("user_id 不合法");
@@ -451,6 +452,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
task.setFailedFileCount(0);
task.setCreatedBy("user:" + request.getUserId());
task.setUserId(request.getUserId());
task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
task.setCreatedAt(LocalDateTime.now());
task.setUpdatedAt(LocalDateTime.now());
try {
@@ -25,6 +25,8 @@ public class FileTaskEntity {
private String errorMessage;
private String createdBy;
private Long userId;
/** 创建任务的客户端设备(JWT 签名 deviceId claim,V138);历史任务为空。 */
private String deviceId;
private String ownerInstanceId;
/** 续跑来源任务 ID:本行是客户端中断后由服务端自动重排队的续跑任务时非空(V129)。 */
private Long resumeOfTaskId;
@@ -193,6 +193,8 @@ public class TaskResumeService {
resume.setRequestJson(original.getRequestJson());
resume.setCreatedBy(original.getCreatedBy());
resume.setUserId(original.getUserId());
// 续跑任务继承原任务设备:续跑由服务端发起,无 JWT 可解析
resume.setDeviceId(original.getDeviceId());
resume.setResumeOfTaskId(original.getId());
int attempt = original.getResumeAttempt() == null ? 0 : original.getResumeAttempt();
resume.setResumeAttempt(attempt + 1);
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.withdraw.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCandidateAddRequest;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskMatchShopsRequest;
import com.nanri.aiimage.common.model.vo.ProductRiskCandidateVo;
@@ -19,6 +20,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -52,6 +54,7 @@ public class WithdrawTaskController {
private final WithdrawResolveService withdrawResolveService;
private final WithdrawTaskService withdrawTaskService;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final AdminAuthSupport adminAuthSupport;
@GetMapping("/candidates")
@Operation(summary = "查询取款备选店铺", description = "按当前用户查询已保存的取款备选店铺列表,用于前端勾选后进行匹配和创建取款任务。")
@@ -126,8 +129,10 @@ public class WithdrawTaskController {
@PostMapping("/tasks")
@Operation(summary = "创建取款任务", description = "为一批已匹配店铺创建一个取款任务,写入任务记录和店铺结果占位记录,并返回 taskId 及初始店铺快照。")
public ApiResponse<WithdrawCreateTaskVo> createTask(@Valid @RequestBody WithdrawCreateTaskRequest request) {
return ApiResponse.success(withdrawTaskService.createTask(request));
public ApiResponse<WithdrawCreateTaskVo> createTask(@Valid @RequestBody WithdrawCreateTaskRequest request,
HttpServletRequest httpRequest) {
return ApiResponse.success(withdrawTaskService.createTask(request,
adminAuthSupport.currentDeviceId(httpRequest)));
}
@PostMapping("/tasks/{taskId}/result")
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessCodes;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.config.TaskPressureProperties;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import com.nanri.aiimage.common.model.vo.ProductRiskDashboardVo;
@@ -166,7 +167,7 @@ public class WithdrawTaskService {
}
@Transactional
public WithdrawCreateTaskVo createTask(WithdrawCreateTaskRequest request) {
public WithdrawCreateTaskVo createTask(WithdrawCreateTaskRequest request, String deviceId) {
validateUserId(request.getUserId());
if (request.getItems() == null || request.getItems().isEmpty()) {
throw new BusinessException("items 不能为空");
@@ -192,6 +193,7 @@ public class WithdrawTaskService {
task.setFailedFileCount(0);
task.setCreatedBy("user:" + request.getUserId());
task.setUserId(request.getUserId());
task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId));
task.setCreatedAt(now);
task.setUpdatedAt(now);
fileTaskMapper.insert(task);
@@ -181,13 +181,14 @@ class PublishTaskServiceTest {
return 1;
}).when(publishFileMapper).insert(any(PublishFileEntity.class));
service.parseAndCreateTask(request);
service.parseAndCreateTask(request, "dev-pub");
org.mockito.ArgumentCaptor<FileTaskEntity> taskCaptor =
org.mockito.ArgumentCaptor.forClass(FileTaskEntity.class);
verify(fileTaskMapper).insert(taskCaptor.capture());
assertEquals("instance-a", realObjectMapper.readTree(
taskCaptor.getValue().getResultJson()).path("ownerInstanceId").asText());
assertEquals("dev-pub", taskCaptor.getValue().getDeviceId());
}
@Test
@@ -207,6 +207,7 @@ class ShopDataCrawlOwnerColumnTest {
assertNotNull(vo);
assertEquals("instance-a", dbTask(3401L).getOwnerInstanceId(), "显式列写入当前实例 id");
assertTrue(dbTask(3401L).getRequestJson().contains("ownerInstanceId"), "兼容字段仍保留在快照 JSON");
assertEquals("dev-sdc", dbTask(3401L).getDeviceId(), "创建入口记录 JWT 设备号");
// stale 扫描命中 RUNNING 任务(2026-09 起全局判死,owner 列不再参与扫描过滤)。
runStaleScan();
@@ -359,7 +360,7 @@ class ShopDataCrawlOwnerColumnTest {
});
lenient().when(fileResultMapper.insert(any(FileResultEntity.class))).thenReturn(1);
return service.createTask(request);
return service.createTask(request, "dev-sdc");
}
private FileTaskEntity dbTask(long taskId) {
@@ -57,7 +57,7 @@ class SimilarAsinTaskLightControllerTest {
// 归属过滤:请求不带 userId 时 filterOwnedTaskIds 直接返回原列表(不会触碰 mapper),
// 故这里传 null mapper 即可,无需 mock
mockMvc = MockMvcBuilders.standaloneSetup(
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null))).build();
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null), null)).build();
}
@Test
@@ -117,7 +117,7 @@ class SimilarAsinTaskLightControllerTest {
// 归属过滤:请求不带 userId 时 filterOwnedTaskIds 直接返回原列表(不会触碰 mapper),
// 故这里传 null mapper 即可,无需 mock
mockMvc = MockMvcBuilders.standaloneSetup(
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null))).build();
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null), null)).build();
mockMvc.perform(post("/api/similar-asin/tasks/progress/batch")
.contentType(MediaType.APPLICATION_JSON)
.content(objectMapper.writeValueAsString(request)))
@@ -141,7 +141,7 @@ class SimilarAsinTaskServiceGroupRefTest {
private SimilarAsinParseVo parse(File workbook, String fileKey) {
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
return service.parseAndCreateTask(request(fileKey));
return service.parseAndCreateTask(request(fileKey), "test-device");
}
private String storedPayloadJson() {
@@ -144,14 +144,17 @@ class SimilarAsinTaskServiceParseDelegationTest {
private SimilarAsinParseVo parse(File workbook, String fileKey) {
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
return service.parseAndCreateTask(request(fileKey));
return service.parseAndCreateTask(request(fileKey), "test-device");
}
@Test
void test_parse_signature_unchanged() throws Exception {
Method parseMethod = SimilarAsinTaskService.class.getMethod("parseAndCreateTask", SimilarAsinParseRequest.class);
// 追加的 String 参数是服务端从 JWT 签名 claim 解析出的设备号(V138),
// 请求体仍是 SimilarAsinParseRequest,客户端契约不变。
Method parseMethod = SimilarAsinTaskService.class.getMethod("parseAndCreateTask",
SimilarAsinParseRequest.class, String.class);
assertEquals(SimilarAsinParseVo.class, parseMethod.getReturnType(), "返回类型一字不变");
assertEquals(1, parseMethod.getParameterCount(), "参数个数一字不变");
assertEquals(2, parseMethod.getParameterCount(), "仅追加设备号参数,请求体契约不变");
}
@Test
@@ -175,7 +178,7 @@ class SimilarAsinTaskServiceParseDelegationTest {
File workbook = buildWorkbook(List.<String[]>of(new String[]{"1", " B01A ", " US "}));
when(localFileStorageService.findLocalSourceFile(" uploads/f1.xlsx ")).thenReturn(workbook);
SimilarAsinParseRequest request = request(" uploads/f1.xlsx ");
SimilarAsinParseVo vo = service.parseAndCreateTask(request);
SimilarAsinParseVo vo = service.parseAndCreateTask(request, "test-device");
assertEquals("B01A", vo.getItems().get(0).getAsin(), "asin 去空格并大写");
assertEquals("US", vo.getItems().get(0).getCountry(), "国家全角空格归一");
@@ -245,7 +248,7 @@ class SimilarAsinTaskServiceParseDelegationTest {
sourceB.setOriginalFilename("delegate-b.xlsx");
request.setFiles(List.of(request.getFiles().get(0), sourceB));
SimilarAsinParseVo vo = service.parseAndCreateTask(request);
SimilarAsinParseVo vo = service.parseAndCreateTask(request, "test-device");
assertEquals(5, vo.getTotalRows(), "3 + 2 行原始数据");
assertEquals(1, vo.getDroppedRows(), "缺国家行被丢弃");
@@ -142,7 +142,7 @@ class SimilarAsinTaskServiceParseLimitsTest {
private SimilarAsinParseVo parse(File workbook, String fileKey) {
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
return service.parseAndCreateTask(request(fileKey));
return service.parseAndCreateTask(request(fileKey), "test-device");
}
@Test
@@ -170,7 +170,7 @@ class SimilarAsinTaskServiceParseLimitsTest {
sourceB.setFileKey("uploads/20260829/limit-b.xlsx");
sourceB.setOriginalFilename("limits-b.xlsx");
request.setFiles(List.of(request.getFiles().get(0), sourceB));
SimilarAsinParseVo vo = service.parseAndCreateTask(request);
SimilarAsinParseVo vo = service.parseAndCreateTask(request, "test-device");
assertEquals(70, vo.getAcceptedRows());
assertEquals(70, vo.getTotalRows());
assertNotNull(vo.getTaskId());
@@ -22,6 +22,7 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.junit.jupiter.MockitoExtension;
@@ -40,6 +41,7 @@ import java.util.concurrent.atomic.AtomicLong;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@@ -47,6 +49,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
@@ -141,7 +144,7 @@ class SimilarAsinTaskServiceParsePreviewTest {
private SimilarAsinParseVo parse(File workbook, String fileKey) {
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
return service.parseAndCreateTask(request(fileKey));
return service.parseAndCreateTask(request(fileKey), "test-device");
}
@Test
@@ -162,6 +165,26 @@ class SimilarAsinTaskServiceParsePreviewTest {
assertTrue(vo.getGroups().size() <= 100);
}
@Test
void task_device_id_recorded_on_create() throws Exception {
// V138:创建任务时把 JWT 设备号显式落库(列表按设备筛选的数据来源)
File workbook = buildWorkbook(3);
parse(workbook, "uploads/20260928/device.xlsx");
ArgumentCaptor<FileTaskEntity> captor = ArgumentCaptor.forClass(FileTaskEntity.class);
verify(fileTaskMapper).insert(captor.capture());
assertEquals("test-device", captor.getValue().getDeviceId());
}
@Test
void task_device_id_null_when_absent() throws Exception {
File workbook = buildWorkbook(3);
when(localFileStorageService.findLocalSourceFile("uploads/20260928/nodev.xlsx")).thenReturn(workbook);
service.parseAndCreateTask(request("uploads/20260928/nodev.xlsx"), null);
ArgumentCaptor<FileTaskEntity> captor = ArgumentCaptor.forClass(FileTaskEntity.class);
verify(fileTaskMapper).insert(captor.capture());
assertNull(captor.getValue().getDeviceId());
}
@Test
void test_task_004_preview_normal_multiple_items() throws Exception {
// 5000 行大文件:响应预览行数量不随总行数增长
@@ -233,11 +256,11 @@ class SimilarAsinTaskServiceParsePreviewTest {
noFiles.setUserId(7L);
noFiles.setFiles(List.of());
noFiles.setApiKey("sk");
assertThrows(BusinessException.class, () -> service.parseAndCreateTask(noFiles));
assertThrows(BusinessException.class, () -> service.parseAndCreateTask(noFiles, "test-device"));
// 非法 user_id
SimilarAsinParseRequest badUser = request("uploads/20260829/preview.xlsx");
badUser.setUserId(null);
assertThrows(BusinessException.class, () -> service.parseAndCreateTask(badUser));
assertThrows(BusinessException.class, () -> service.parseAndCreateTask(badUser, "test-device"));
}
@Test
@@ -135,7 +135,7 @@ class SimilarAsinTaskServicePreviewConfigTest {
private SimilarAsinParseVo parse(File workbook, String fileKey) {
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
return service.parseAndCreateTask(request(fileKey));
return service.parseAndCreateTask(request(fileKey), "test-device");
}
@Test
@@ -142,7 +142,7 @@ class SimilarAsinTaskServiceWorkbookControlTest {
private SimilarAsinParseVo parse(File workbook, String fileKey) {
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
return service.parseAndCreateTask(request(fileKey));
return service.parseAndCreateTask(request(fileKey), "test-device");
}
@Test
@@ -168,7 +168,7 @@ class SimilarAsinTaskServiceWorkbookControlTest {
sourceB.setFileKey("uploads/20260829/wb-b.xlsx");
sourceB.setOriginalFilename("workbook-b.xlsx");
request.setFiles(List.of(request.getFiles().get(0), sourceB));
SimilarAsinParseVo vo = service.parseAndCreateTask(request);
SimilarAsinParseVo vo = service.parseAndCreateTask(request, "test-device");
assertEquals(60, vo.getAcceptedRows());
assertEquals(60, vo.getTotalRows());
assertNotNull(vo.getTaskId());
@@ -65,7 +65,7 @@ class ResultSuccessTimingContractTest {
return null;
}).when(similarAsinTaskService).submitResult(eq(TASK_ID), any(SimilarAsinSubmitResultRequest.class));
ApiResponse<Void> response = new SimilarAsinController(similarAsinTaskService, new TaskProgressOwnershipSupport(null))
ApiResponse<Void> response = new SimilarAsinController(similarAsinTaskService, new TaskProgressOwnershipSupport(null), null)
.result(TASK_ID, new SimilarAsinSubmitResultRequest(), mock(HttpServletResponse.class));
responseAfterService.set(response != null);
@@ -80,7 +80,7 @@ class ResultSuccessTimingContractTest {
doAnswer(invocation -> null)
.when(appearancePatentTaskService).submitResult(eq(TASK_ID), any(AppearancePatentSubmitResultRequest.class));
ApiResponse<Void> response = new AppearancePatentController(appearancePatentTaskService, new TaskProgressOwnershipSupport(null))
ApiResponse<Void> response = new AppearancePatentController(appearancePatentTaskService, new TaskProgressOwnershipSupport(null), null)
.result(TASK_ID, new AppearancePatentSubmitResultRequest(), mock(HttpServletResponse.class));
assertTrue(response.isSuccess(), "success=true");
@@ -94,7 +94,7 @@ class ResultSuccessTimingContractTest {
vo.setChunkIndex(1);
when(collectDataService.submitResult(eq(TASK_ID), any(CollectDataSubmitResultRequest.class))).thenReturn(vo);
ApiResponse<CollectDataSubmitResultVo> response = new CollectDataController(collectDataService, new TaskProgressOwnershipSupport(null))
ApiResponse<CollectDataSubmitResultVo> response = new CollectDataController(collectDataService, new TaskProgressOwnershipSupport(null), null)
.submitResult(TASK_ID, new CollectDataSubmitResultRequest());
assertTrue(response.isSuccess(), "success=true");
@@ -121,7 +121,7 @@ class ResultSuccessTimingContractTest {
org.mockito.Mockito.doThrow(new BusinessException("落库失败"))
.when(similarAsinTaskService).submitResult(eq(TASK_ID), any(SimilarAsinSubmitResultRequest.class));
assertThrows(BusinessException.class, () -> new SimilarAsinController(similarAsinTaskService, new TaskProgressOwnershipSupport(null))
assertThrows(BusinessException.class, () -> new SimilarAsinController(similarAsinTaskService, new TaskProgressOwnershipSupport(null), null)
.result(TASK_ID, new SimilarAsinSubmitResultRequest(), mock(HttpServletResponse.class)));
}
@@ -134,7 +134,7 @@ class ResultSuccessTimingContractTest {
}
return null;
}).when(similarAsinTaskService).submitResult(eq(TASK_ID), any(SimilarAsinSubmitResultRequest.class));
SimilarAsinController controller = new SimilarAsinController(similarAsinTaskService, new TaskProgressOwnershipSupport(null));
SimilarAsinController controller = new SimilarAsinController(similarAsinTaskService, new TaskProgressOwnershipSupport(null), null);
assertThrows(BusinessException.class, () -> controller
.result(TASK_ID, new SimilarAsinSubmitResultRequest(), mock(HttpServletResponse.class)));
@@ -152,7 +152,7 @@ class ResultSuccessTimingContractTest {
order.add("service-submit");
return null;
}).when(appearancePatentTaskService).submitResult(eq(TASK_ID), any(AppearancePatentSubmitResultRequest.class));
AppearancePatentController controller = new AppearancePatentController(appearancePatentTaskService, new TaskProgressOwnershipSupport(null));
AppearancePatentController controller = new AppearancePatentController(appearancePatentTaskService, new TaskProgressOwnershipSupport(null), null);
ApiResponse<Void> response = controller.result(TASK_ID, new AppearancePatentSubmitResultRequest(),
mock(HttpServletResponse.class));