diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java index 3fa493484..dc08757ea 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java @@ -1,7 +1,6 @@ package com.nanri.aiimage.modules.publish.service; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.crypto.digest.DigestUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -11,7 +10,6 @@ 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; @@ -48,10 +46,10 @@ import com.nanri.aiimage.modules.task.service.TaskDistributedLockService; import com.nanri.aiimage.modules.task.service.TaskFileJobService; import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService; import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; +import com.nanri.aiimage.modules.task.service.pipeline.AbstractFileTaskPipeline; import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoShopMatchResultVo; import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopIndexService; import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import com.nanri.aiimage.common.service.DistributedJobLockService; import org.springframework.beans.factory.annotation.Value; @@ -83,8 +81,7 @@ import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler; @Slf4j @Service -@RequiredArgsConstructor -public class PublishTaskService { +public class PublishTaskService extends AbstractFileTaskPipeline { public static final String MODULE_TYPE = "PUBLISH"; @@ -111,14 +108,9 @@ public class PublishTaskService { private final PublishWorkbookService workbookService; private final PublishFileMapper publishFileMapper; private final PublishItemMapper publishItemMapper; - private final FileTaskMapper fileTaskMapper; - private final FileResultMapper fileResultMapper; private final TaskChunkMapper taskChunkMapper; private final TaskScopeStateMapper taskScopeStateMapper; - private final TaskFileJobService taskFileJobService; - private final TaskDistributedLockService taskDistributedLockService; private final TransientPayloadStorageService transientPayloadStorageService; - private final OssStorageService ossStorageService; private final ObjectMapper objectMapper; private final TransactionTemplate transactionTemplate; private final DistributedJobLockService distributedJobLockService; @@ -126,6 +118,66 @@ public class PublishTaskService { private final TaskProgressLightAssembler taskProgressLightAssembler; private final TaskHeartbeatPositionService taskHeartbeatPositionService; + /** + * 显式构造子取代 {@code @RequiredArgsConstructor}:参数表逐枚沿用原字段声明序,只把 + * 交给底座的五枚({@code fileTaskMapper}/{@code fileResultMapper}/{@code taskDistributedLockService} + * /{@code taskFileJobService}/{@code ossStorageService})转给 {@code super}。 + * 顺序一字不动是为了那四处调用点——{@code PublishTaskServiceTest}/ + * {@code PublishDashboardAggregateTest}/{@code PublishBatchLoadingSnapshotEquivTest}/ + * {@code PublishSubmitResultSnapshotTest} 全都直接 {@code new PublishTaskService(…19 枚实参…)}, + * 改顺序等于把回传段 golden 的夹具与被测件重排,白增风险。 + */ + public PublishTaskService(LocalFileStorageService localFileStorageService, + ZiniaoShopSwitchService ziniaoShopSwitchService, + PublishWorkbookService workbookService, + PublishFileMapper publishFileMapper, + PublishItemMapper publishItemMapper, + FileTaskMapper fileTaskMapper, + FileResultMapper fileResultMapper, + TaskChunkMapper taskChunkMapper, + TaskScopeStateMapper taskScopeStateMapper, + TaskFileJobService taskFileJobService, + TaskDistributedLockService taskDistributedLockService, + TransientPayloadStorageService transientPayloadStorageService, + OssStorageService ossStorageService, + ObjectMapper objectMapper, + TransactionTemplate transactionTemplate, + DistributedJobLockService distributedJobLockService, + InstanceMetadata instanceMetadata, + TaskProgressLightAssembler taskProgressLightAssembler, + TaskHeartbeatPositionService taskHeartbeatPositionService) { + super(fileTaskMapper, fileResultMapper, taskDistributedLockService, taskFileJobService, ossStorageService); + this.localFileStorageService = localFileStorageService; + this.ziniaoShopSwitchService = ziniaoShopSwitchService; + this.workbookService = workbookService; + this.publishFileMapper = publishFileMapper; + this.publishItemMapper = publishItemMapper; + this.taskChunkMapper = taskChunkMapper; + this.taskScopeStateMapper = taskScopeStateMapper; + this.transientPayloadStorageService = transientPayloadStorageService; + this.objectMapper = objectMapper; + this.transactionTemplate = transactionTemplate; + this.distributedJobLockService = distributedJobLockService; + this.instanceMetadata = instanceMetadata; + this.taskProgressLightAssembler = taskProgressLightAssembler; + this.taskHeartbeatPositionService = taskHeartbeatPositionService; + } + + @Override + protected String moduleType() { + return MODULE_TYPE; + } + + /** + * 本支回传侧的加载格现网就是直读 DB。接上 {@link #requireSubmissionTask} 之后本格不是死件: + * {@link #requireTaskRecord} 走的就是那条组合(加载+模块校验由底座那一格做, + * 归属那一格留本地,因为它还认 {@code userId} 可空——见下)。 + */ + @Override + protected FileTaskEntity loadTaskForSubmission(Long taskId) { + return fileTaskMapper.selectById(taskId); + } + @Value("${aiimage.publish.stale-timeout-minutes:30}") private int staleTimeoutMinutes; @@ -400,7 +452,7 @@ public class PublishTaskService { } public PublishHistoryVo history(Long userId, Integer limit) { - validateUserId(userId); + requireUserId(userId); int safeLimit = limit == null || limit <= 0 ? 50 : Math.min(limit, 100); Long total = fileTaskMapper.selectCount(new LambdaQueryWrapper() .eq(FileTaskEntity::getModuleType, MODULE_TYPE) @@ -417,7 +469,7 @@ public class PublishTaskService { } public PublishDashboardVo dashboard(Long userId) { - validateUserId(userId); + requireUserId(userId); PublishDashboardVo response = new PublishDashboardVo(); response.setPendingCount(0L); response.setRunningCount(0L); @@ -547,15 +599,7 @@ public class PublishTaskService { PublishWorkbookService.PackagedResult packaged = workbookService.packageTaskResult( workDirectory, task.getTaskNo(), safeInt(task.getSourceFileCount()), inputs); - String objectKey = ossStorageService.uploadResultFile(packaged.file(), MODULE_TYPE); - result.setResultFilename(packaged.filename()); - result.setResultFileUrl(objectKey); - result.setResultFileSize(packaged.file().length()); - result.setResultContentType(packaged.contentType()); - result.setRowCount(rowCount); - result.setSuccess(1); - result.setErrorMessage(null); - fileResultMapper.updateById(result); + publishResultFile(result, packaged.file(), packaged.filename(), packaged.contentType(), rowCount, false); int failedCount = (int) files.stream().filter(file -> STATUS_FAILED.equals(file.getStatus())).count(); task.setStatus(STATUS_SUCCESS); @@ -646,7 +690,7 @@ public class PublishTaskService { } public void deleteHistory(Long resultId, Long userId) { - validateUserId(userId); + requireUserId(userId); FileResultEntity result = fileResultMapper.selectById(resultId); if (result == null || !MODULE_TYPE.equals(result.getModuleType())) { throw new BusinessException("结果不存在"); @@ -902,7 +946,7 @@ public class PublishTaskService { result.setSuccess(0); result.setErrorMessage(null); fileResultMapper.updateById(result); - taskFileJobService.enqueueAssembleResult(taskId, MODULE_TYPE, result.getId(), ownerScopeKey(taskId)); + enqueueResultAssembly(taskId, result.getId(), ownerScopeKey(taskId)); } private PersistedTask persistTask(PublishParseRequest request, List preparedFiles, String deviceId) { @@ -910,25 +954,16 @@ public class PublishTaskService { int failedFiles = (int) preparedFiles.stream().filter(file -> STATUS_FAILED.equals(file.status)).count(); int processableFiles = preparedFiles.size() - failedFiles; - FileTaskEntity task = new FileTaskEntity(); - task.setTaskNo(MODULE_TYPE + "-" + IdUtil.getSnowflakeNextIdStr()); - task.setModuleType(MODULE_TYPE); - task.setTaskMode("PYTHON_QUEUE"); - task.setStatus(processableFiles > 0 ? STATUS_PENDING : STATUS_FAILED); - task.setSourceFileCount(preparedFiles.size()); + FileTaskEntity task = newTaskHeader(processableFiles > 0 ? STATUS_PENDING : STATUS_FAILED, + "PYTHON_QUEUE", request.getUserId(), deviceId, preparedFiles.size(), now); task.setSuccessFileCount(0); task.setFailedFileCount(failedFiles); task.setRequestJson(writeJson(request, "序列化上架任务失败")); task.setResultJson(writeJson(Map.of("ownerInstanceId", currentInstanceId()), "Failed to save publish task instance owner")); 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); - fileTaskMapper.insert(task); + insertTask(task); List savedFiles = new ArrayList<>(); int totalRows = 0; @@ -1072,7 +1107,7 @@ public class PublishTaskService { task.setErrorMessage(null); task.setFinishedAt(null); fileTaskMapper.updateById(task); - taskFileJobService.enqueueAssembleResult(taskId, MODULE_TYPE, result.getId(), ownerScopeKey(taskId)); + enqueueResultAssembly(taskId, result.getId(), ownerScopeKey(taskId)); return new SubmitResultCommit(false, Set.copyOf(committedPayloads)); } @@ -1191,7 +1226,7 @@ public class PublishTaskService { if (request == null) { throw new BusinessException("请求不能为空"); } - validateUserId(request.getUserId()); + requireUserId(request.getUserId()); if (request.getFiles() == null || request.getFiles().isEmpty()) { throw new BusinessException("请先上传 Excel 文件"); } @@ -1215,22 +1250,22 @@ public class PublishTaskService { } private FileTaskEntity requireTaskRecord(Long taskId, Long userId) { - if (taskId == null || taskId <= 0) { - throw new BusinessException("taskId 不合法"); - } + requireTaskId(taskId); // user_id 为空**不**等于跳过归属校验:这里留空只允许出现在桌面执行器的两个端点上 // (GET /tasks/{id}/items 与 POST /tasks/{id}/result——执行器的身份由客户端 // crawler_core/user_token.py 的 Session.request 钩子补 Authorization: Bearer,4.0.14 之前的 // 存量装机不带,服务端才解析不出身份、userId 才落到 null)。其余端点一律由 PublishController // 用 requireOwnershipUserId 传入会话身份,缺失即 401、冒名即 403。 - FileTaskEntity task = fileTaskMapper.selectById(taskId); - if (task == null || !MODULE_TYPE.equals(task.getModuleType()) - || (userId != null && !userId.equals(task.getUserId()))) { + // 加载+模块校验那一格交底座 requireSubmissionTask:它抛的「任务不存在」与本支逐字同形、 + // 同为 BusinessException、检查之间无副作用 ⇒ 把原来的三条件一次判拆成两条件顺序判,对外结果不变。 + FileTaskEntity task = requireSubmissionTask(taskId); + if (userId != null && !userId.equals(task.getUserId())) { throw new BusinessException("任务不存在"); } return task; } + @Override public void ensureTaskOwnedByCurrentInstance(FileTaskEntity task, String operation) { String owner = ownerFromTask(task); if (owner == null || owner.isBlank() || Objects.equals(owner, currentInstanceId())) { @@ -1835,15 +1870,9 @@ public class PublishTaskService { if (result != null) { return result; } - result = new FileResultEntity(); - result.setTaskId(task.getId()); - result.setModuleType(MODULE_TYPE); - result.setSourceFilename(task.getTaskNo()); + result = newScopeRow(task.getId(), task.getUserId(), task.getTaskNo(), null, null, 0, LocalDateTime.now()); result.setResultContentType(safeInt(task.getSourceFileCount()) == 1 ? PublishWorkbookService.XLSX_CONTENT_TYPE : PublishWorkbookService.ZIP_CONTENT_TYPE); - result.setSuccess(0); - result.setUserId(task.getUserId()); - result.setCreatedAt(LocalDateTime.now()); fileResultMapper.insert(result); return result; } @@ -1960,12 +1989,6 @@ public class PublishTaskService { return taskIds.stream().filter(id -> id != null && id > 0).distinct().limit(50).toList(); } - private void validateUserId(Long userId) { - if (userId == null || userId <= 0) { - throw new BusinessException("user_id 不合法"); - } - } - private String aggregateSourceFilename(List files) { if (files.isEmpty()) { return "";