feat(taskcenter): 13 个客户端任务创建入口记录 JWT 设备号
设备号只认 JWT 签名 claim(不接受客户端可控请求头),controller 读取、service 归一化落库;续跑任务由服务端发起,继承原任务设备号。品牌检测走独立 brand_crawl_tasks 表,同一口径。
This commit is contained in:
+7
-2
@@ -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")
|
||||
|
||||
+3
-1
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user