refactor(phase-3): 3D 迁移本体——publish 接上底座,七支至此全部有生产调用方在底线上

`PublishTaskService extends AbstractFileTaskPipeline<PublishRowDto>`。上一笔腾出的额度足够,本笔未动任何门禁判据(`writeJson` 并档因此不再是必需,仍然未做、仍待逐处记名授权)。

接上六格(比 3D 前置测绘预估的四格多两格,两处都是实测新确认):
- `requireTaskId`:原 `requireTaskRecord` 内联的「taskId 不合法」三行。
- `requireSubmissionTask` ← 新确认:底座那格做的正是「加载+模块校验+『任务不存在』」。把本支原来的一次三条件判拆成两次顺序判(异常类型/文案/检查之间无副作用三者同源,判据不变),于是 `loadTaskForSubmission` 这枚钩子**不是死件**——它被建单外的全部 `requireTask*` 路径真调用着。
- `requireUserId`:删本支 `validateUserId`,四处调用点转名(文案逐字相同,实测过)。
- `newTaskHeader`+`insertTask`:注意建单入口 `validateParseRequest` 已先 `requireUserId` ⇒ 底座那格在这条路上是空转,不新增拒绝点。
- `newScopeRow`:结果行。
- `publishResultFile` ← 新确认:底座注释本就列 publish 为出处,这次逐列核过是真接得上(上传入参、6 列、`success=1`、清 `errorMessage`、`updateById`),不是「同形但接不上」。

原样留本地三格(都是形状差、不是没做):两参 `acquire` +不带 code 的「任务正被占用,请稍后重试」;SUCCESS 静默短路/FAILED 抛「任务已失败」那第三种终态形状(见 `TerminalRejection#ERROR` 的 3D 补正);本支私有 `writeJson`。

等值证据(这三格没有既有 golden 覆盖——publish 只有 batch-loading 与 submit-result 两条快照,建单段没快照,所以没停在「读两段代码觉得一样」):把 `git show HEAD` 的旧块、现块、底座件体各抽 setter 集合做差集 ⇒ 头行 **16 列 = 现留 6 + 底座 10,未接住为空、底座多写为空**;写列 **7 = 7 完全一致**;结果行只多两列,是新建实体上本就为 null 的 `rowCount`/`sourceFileUrl`(等价,不是补默认值)。底座件自身的逐列行为由既有 `AbstractFileTaskPipelineTest` 钉着(含「两列同一个显式时刻」「不给模块自决列编默认值」「userId 非法在建行前就拒」)。

构造子 19 枚参数**逐枚沿用原字段声明序**,只把交给底座的五枚转给 `super`:`PublishTaskServiceTest`/`PublishDashboardAggregateTest`/`PublishBatchLoadingSnapshotEquivTest`/`PublishSubmitResultSnapshotTest` 四处 `new PublishTaskService(…)` 一个字都不用改——改顺序就是把回传段 golden 的夹具重排。

行数账(`--numstat` 实测):本笔净 **+23**(2109→2132);含上一笔抽件累计 **2250→2132,净减 118**,基线一格未改、`--write` 未跑。

门禁:定向 **191 例/0 红/1 skip**(publish 全部 10 支测试类+七把棘轮/护栏+`SqlLayeringConventionTest`);后端全量 **4542/0 红/15 skipped/BUILD SUCCESS,真实 rc=0**。两次全量之间出过一记红,定性如下——
- `ShopDataCrawlTemplateLargeWorkbookTest.test_task_026_…boundary_limit_and_overflow`:「5000 行模板写入须在预算内完成,实际=87322ms」。那是**墙上时钟预算断言**、且不在本笔射程(本笔只动 publish)。复现而非宣称:单跑该类 8/0(整类 171.3s→99.3s),第二次全量该类 42.29s 且整树 0 红。这条尺的读数强依赖本机有无并发在飞。
- 用例数 4540→4542 的 +2 归另一路的在飞件(`productrisk` 那三笔在他们仓里落地),**本笔零新增 `@Test`**。
- ops `ruff check .` All checks passed;readability 棘轮 2 failed/7 passed,offender 三处全不归本笔(`ProductRiskTaskService` 1485→1495、`BrandProductRiskTab.vue` 1722→1724 已随另一路 `ab42adad`/`a97dbf7f` 进入 HEAD 而基线未同步;`app_client/amazon/approve_v2.py` 1279→1284 与 `approve.py` 三枚长函数属 app_client 面)⇒ 不动基线、不 `--write`、不代收。格式步未纳管 ⇒ 如实跳过。真机启动验收本格仍欠(七支全部欠,属 Phase 8 收口项)。
This commit is contained in:
2026-10-19 19:56:45 +08:00
parent cdbe247dbf
commit a125e8f8a5
@@ -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<PublishRowDto> {
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}:参数表<b>逐枚沿用原字段声明序</b>,只把
* 交给底座的五枚({@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} 之后本格<b>不是死件</b>:
* {@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<FileTaskEntity>()
.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<PreparedFile> 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<PublishFileEntity> 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<PreparedFile> files) {
if (files.isEmpty()) {
return "";