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
@@ -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 {