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