refactor(phase-3): 3A 拆薄第十一笔——AP 结果作业与出表出件,服务 1827→1409

This commit is contained in:
2026-10-20 17:58:54 +08:00
parent 3a22267b0d
commit 492a27270a
3 changed files with 652 additions and 457 deletions
@@ -13,7 +13,6 @@ import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePate
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentDeliverySupport;
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentExcelParser;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.util.GroupResultPropagator;
import com.nanri.aiimage.common.util.FailedStatusRowFilter;
import com.nanri.aiimage.config.AppearancePatentProperties;
import com.nanri.aiimage.config.InstanceMetadata;
@@ -39,9 +38,9 @@ import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentParse
import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentTaskBatchVo;
import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentTaskDetailVo;
import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentTaskItemVo;
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentResultJobSupport;
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentResultPackager;
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentRowOutcome;
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentSheetBuilder;
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentStaleTaskScanner;
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentTaskOwnership;
import com.nanri.aiimage.modules.file.service.LocalFileStorageService;
@@ -58,12 +57,10 @@ import com.nanri.aiimage.modules.task.model.entity.TaskProgressSnapshotEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity;
import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
import com.nanri.aiimage.modules.task.service.TaskFileJobService;
import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport;
import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService;
import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.PlatformTransactionManager;
@@ -75,7 +72,6 @@ import org.springframework.transaction.support.TransactionTemplate;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.time.Duration;
import java.time.LocalDateTime;
@@ -88,7 +84,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.function.Supplier;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -111,8 +106,6 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
private static final String STATUS_RUNNING = "RUNNING";
private static final String STATUS_SUCCESS = "SUCCESS";
private static final String STATUS_FAILED = "FAILED";
private static final String CONTENT_TYPE_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
private static final String CONTENT_TYPE_ZIP = "application/zip";
private static final int CHUNK_PAYLOAD_MERGE_RETRY_LIMIT = 3;
private static final Duration TASK_LOCK_TTL = Duration.ofMinutes(5);
private static final long TASK_LOCK_WAIT_MILLIS = 10000L;
@@ -361,40 +354,7 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
* 常态(无终态失败 job)下只查两次即返回,不触发分片扫描。
*/
private void maybeRecoverTerminalFailedAssemble(Long taskId) {
if (taskId == null || taskId <= 0) {
return;
}
try {
FileResultEntity result = findResultRecord(taskId);
if (result == null) {
return;
}
if (taskFileJobService.hasSuccessfulAssembleJob(taskId, MODULE_TYPE, result.getId())) {
return;
}
if (!taskFileJobService.isTerminalFailedAssembleJob(taskId, MODULE_TYPE, result.getId())) {
return;
}
if (!isResultSubmissionComplete(taskId)) {
log.info("[appearance-patent] 组装 job 终态失败但分片仍未补传完整,暂不恢复 taskId={} resultId={}",
taskId, result.getId());
return;
}
log.info("[appearance-patent] 分片已补传完整,恢复终态失败的组装 job taskId={} resultId={}",
taskId, result.getId());
taskFileJobService.resetTerminalFailedForRecovery(taskId, MODULE_TYPE, result.getId());
} catch (Exception ex) {
log.warn("[appearance-patent] 补传恢复检查失败(不影响本次补传)taskId={} err={}", taskId, ex.getMessage(), ex);
}
}
/** 按 task 取结果行(不创建);不存在返回 null。 */
private FileResultEntity findResultRecord(Long taskId) {
List<FileResultEntity> rows = fileResultMapper.selectList(new LambdaQueryWrapper<FileResultEntity>()
.eq(FileResultEntity::getTaskId, taskId)
.eq(FileResultEntity::getModuleType, MODULE_TYPE)
.last("limit 1"));
return rows == null || rows.isEmpty() ? null : rows.getFirst();
resultJobSupport().maybeRecoverTerminalFailedAssemble(taskId);
}
private void submitResultLocked(Long taskId, AppearancePatentSubmitResultRequest request) {
@@ -676,6 +636,25 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
this::firstNonBlank, this::normalize);
}
/**
* E 聚类(结果作业与出表)住在 {@link AppearancePatentResultJobSupport}(3A 拆薄第十一笔):
* 作业取锁/归属/进度、终态收尾、失败兜底组装与 xlsx/zip 出表逐字搬移;
* {@code processResultFileJob}/{@code fallbackAssembleResultFile}/{@code cleanupResultFileJob}
* 三个公有入口与按名反射点名的 {@code maybeRecoverTerminalFailedAssemble}/
* {@code writeResultWorkbook} 保留同名薄委托。
*/
private AppearancePatentResultJobSupport resultJobSupport() {
return new AppearancePatentResultJobSupport(
MODULE_TYPE, TASK_LOCK_WAIT_MILLIS, properties, storageProperties,
fileTaskMapper, fileResultMapper, taskScopeStateMapper, taskChunkMapper,
taskCacheService, taskFileJobService, ossStorageService,
payloadSupport(), rowReader(), resultPackager(), deliverySupport(), progressSupport(),
llmBatchPipeline(), taskOwnership(),
this::acquireTaskLock, this::touchJavaSideTaskActivity,
AppearancePatentTaskService::resolveTaskExecutionStatus, this::firstNonBlank,
this::buildAggregateSourceFilenameLabel, this::buildAggregateScopeKey);
}
/**
* D 聚类(分片回传与范围状态)住在 {@link AppearancePatentChunkSubmissionSupport}
* (3A 拆薄第九笔)。任务准入、归属、分组展开、行计数、载荷写入、序列化与收尾由本类回调交出。
@@ -984,170 +963,15 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
}
private void finalizeTask(FileTaskEntity task, String error, int rowCount, boolean assembleWorkbook) {
String finalError = error;
AppearancePatentRowOutcome.Facts deliveryFacts = AppearancePatentRowOutcome.Facts.EMPTY;
FileResultEntity result = null;
boolean persistedRowsPresent = rowReader().hasPersistedResultRows(task.getId());
List<FileResultEntity> rows = fileResultMapper.selectList(new LambdaQueryWrapper<FileResultEntity>()
.eq(FileResultEntity::getTaskId, task.getId())
.eq(FileResultEntity::getModuleType, MODULE_TYPE)
.last("limit 1"));
if (!rows.isEmpty()) {
result = rows.getFirst();
} else if (assembleWorkbook && persistedRowsPresent) {
result = createResultRecordForAssembly(task, rowCount);
}
if (result != null) {
boolean shouldAssembleResult = assembleWorkbook && (finalError == null || finalError.isBlank() || persistedRowsPresent);
if (shouldAssembleResult && shouldAssembleSynchronously()) {
try {
deliveryFacts = assembleResultWorkbook(task, result);
} catch (Exception ex) {
log.warn("[appearance-patent] assemble result workbook failed taskId={} err={}", task.getId(), ex.getMessage());
finalError = firstNonBlank(finalError, "Generate appearance patent result failed");
}
}
}
boolean failed = finalError != null && !finalError.isBlank();
boolean waitingForAssemble = !failed && assembleWorkbook && !shouldAssembleSynchronously();
task.setStatus(resolveTaskExecutionStatus(waitingForAssemble, failed));
task.setSuccessFileCount(failed ? 0 : 1);
task.setFailedFileCount(failed ? 1 : 0);
// 缺口只写在消息里,不参与 failed 计算:95% 以上有结论的单仍是成功,但用户要看得见"N 行没检测完"
task.setErrorMessage(appendDeliveryGapMessage(finalError, deliveryFacts));
task.setUpdatedAt(LocalDateTime.now());
task.setFinishedAt(waitingForAssemble ? null : LocalDateTime.now());
fileTaskMapper.updateById(task);
if (result != null) {
result.setSuccess(failed ? 0 : 1);
result.setErrorMessage(finalError);
result.setRowCount(rowCount > 0 ? rowCount : result.getRowCount());
boolean shouldAssembleResult = assembleWorkbook && (!failed || persistedRowsPresent);
if (shouldAssembleResult) {
result.setResultFilename(safeFileStem(result.getSourceFilename()) + "-result.xlsx");
result.setResultFileUrl(null);
result.setResultFileSize(0L);
result.setResultContentType(CONTENT_TYPE_XLSX);
}
fileResultMapper.updateById(result);
if (shouldAssembleResult) {
enqueueResultAssembly(task, result, true);
} else if (assembleWorkbook && failed) {
log.warn("[appearance-patent] skip failed task workbook assembly because no persisted result rows taskId={}", task.getId());
}
}
taskCacheService.deleteTaskCache(task.getId());
resultJobSupport().finalizeTask(task, error, rowCount, assembleWorkbook);
}
private FileResultEntity findOrCreateResultRecordForAssembly(FileTaskEntity task, int rowCount) {
if (task == null || task.getId() == null) {
return null;
}
List<FileResultEntity> rows = fileResultMapper.selectList(new LambdaQueryWrapper<FileResultEntity>()
.eq(FileResultEntity::getTaskId, task.getId())
.eq(FileResultEntity::getModuleType, MODULE_TYPE)
.last("limit 1"));
if (rows != null && !rows.isEmpty()) {
return rows.getFirst();
}
return createResultRecordForAssembly(task, rowCount);
}
private TaskFileJobEntity enqueueResultAssembly(FileTaskEntity task, FileResultEntity result, boolean dispatchWhenIdle) {
if (task == null || task.getId() == null || result == null || result.getId() == null) {
return null;
}
TaskFileJobEntity job = taskFileJobService.enqueueAssembleResult(
task.getId(), MODULE_TYPE, result.getId(), buildTaskOwnerScopeKey(task));
if (dispatchWhenIdle
&& job != null
&& "RUNNING".equals(job.getStatus())) {
taskFileJobService.requeue(job.getId(), "Python upload finished, assembling xlsx");
}
return job;
}
private FileResultEntity createResultRecordForAssembly(FileTaskEntity task, int rowCount) {
AppearancePatentParsedPayloadDto payload = payloadSupport().readParsedPayload(task);
List<AppearancePatentSourceFileDto> sourceFiles = payload.getSourceFiles() == null ? List.of() : payload.getSourceFiles();
FileResultEntity result = new FileResultEntity();
result.setTaskId(task.getId());
result.setModuleType(MODULE_TYPE);
result.setSourceFilename(buildAggregateSourceFilenameLabel(sourceFiles));
result.setSourceFileUrl(buildAggregateScopeKey(sourceFiles));
result.setRowCount(rowCount > 0 ? rowCount : (payload.getAllItems() == null ? 0 : payload.getAllItems().size()));
result.setUserId(task.getUserId());
result.setCreatedAt(LocalDateTime.now());
fileResultMapper.insert(result);
log.warn("[appearance-patent] recreated missing result record for workbook assembly taskId={} resultId={}",
task.getId(), result.getId());
return result;
}
private boolean shouldAssembleSynchronously() {
return false;
return resultJobSupport().findOrCreateResultRecordForAssembly(task, rowCount);
}
public boolean processResultFileJob(TaskFileJobEntity job) {
if (job == null || job.getTaskId() == null || job.getResultId() == null) {
throw new BusinessException("结果文件作业参数不完整");
}
TaskDistributedLockService.LockHandle lockHandle = acquireTaskLock(job.getTaskId(), TASK_LOCK_WAIT_MILLIS);
if (lockHandle == null) {
taskFileJobService.requeue(job.getId(), "Task is busy, waiting for appearance patent result merge");
touchJavaSideTaskActivity(job.getTaskId());
return false;
}
try (lockHandle) {
return processResultFileJobLocked(job);
}
}
private boolean processResultFileJobLocked(TaskFileJobEntity job) {
FileTaskEntity task = fileTaskMapper.selectById(job.getTaskId());
if (task == null || !MODULE_TYPE.equals(task.getModuleType())) {
throw new BusinessException("任务不存在");
}
ensureTaskOwnedByCurrentInstance(task, "assemble result file");
job.setScopeKey(buildTaskOwnerScopeKey(task));
if (!isJobOwnedByCurrentInstance(job)) {
log.info("[appearance-patent] skip result file job because owner is another instance jobId={} taskId={} owner={} current={}",
job.getId(), job.getTaskId(), ownerFromScopeKey(job.getScopeKey()), currentInstanceId());
return false;
}
FileResultEntity result = fileResultMapper.selectById(job.getResultId());
if (result == null || !MODULE_TYPE.equals(result.getModuleType())) {
throw new BusinessException("结果记录不存在");
}
// 已交付的作业不再重跑。Worker 那三处 SUCCESS 守卫挡不住这一格:结果文件已经挂上、
// 作业却被事件重投时它照样执行,而分片在交付时已被 cleanupResultFileJob 删掉,
// 重跑只能读到 0 行、连抛「结果为空」把 retry 预算烧满(2026-10-19 任务 31527:
// 23:02:35 交付,23:02:40→23:03:20 又跑五次,行账读数 expectedRows=0/coverage=100.00%
// 与那条抛同时出现——空集在闸门里是"通过",出表那边却是"没结果")。
// 与 fallbackAssembleResultFile 同一枚幂等闸。补传恢复不受影响:
// maybeRecoverTerminalFailedAssemble 自带 hasSuccessfulAssembleJob 早退,
// 而交付之后任务已终态,迟到分片被 rejectNotRunning 拒掉,没有合法的第二轮组装。
if (result.getResultFileUrl() != null && !result.getResultFileUrl().isBlank()) {
log.info("[appearance-patent] 结果文件已交付,跳过重复组装 taskId={} resultId={} jobId={}",
task.getId(), result.getId(), job.getId());
return true;
}
List<TaskChunkEntity> chunks = taskChunkMapper.selectList(new LambdaQueryWrapper<TaskChunkEntity>()
.eq(TaskChunkEntity::getTaskId, task.getId())
.eq(TaskChunkEntity::getModuleType, MODULE_TYPE)
.orderByAsc(TaskChunkEntity::getChunkIndex));
int llmWorkUnits = llmBatchPipeline().countLlmWorkUnits(chunks, Math.max(1, properties.getLlmBatchSize()));
int plannedLlmUnits = Math.max(1, llmWorkUnits);
int totalProgressUnits = Math.max(3, plannedLlmUnits + 3);
saveFileBuildProgress(task, job, totalProgressUnits, 0, "正在提交检测");
submitLlmBatches(task, result, job, chunks);
if (STATUS_RUNNING.equals(task.getStatus()) && !isResultSubmissionComplete(task.getId())) {
taskFileJobService.touchRunning(job.getId());
touchJavaSideTaskActivity(task.getId());
saveFileBuildProgress(task, job, totalProgressUnits, Math.max(1, plannedLlmUnits), "等待 Python 继续回传数据");
return false;
}
return completeLlmFileJob(task, result, job, totalProgressUnits);
return resultJobSupport().processResultFileJob(job);
}
/**
@@ -1169,15 +993,6 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
return deliverySupport().requestRecheckForMissingRows(task, job, facts);
}
/**
* 只量行账、不出表。补检的决定必须做在 {@code assembleResultWorkbook} 之前,而那一跑完就把
* 成品传上 OSS 并挂好了 {@code resultFileUrl}。判据与出表共用
* {@link AppearancePatentRowOutcome#summarize},两边不许各判一套。
*/
private AppearancePatentRowOutcome.Facts measureDeliveryFacts(FileTaskEntity task, FileResultEntity result) {
return deliverySupport().measureDeliveryFacts(task, result);
}
/**
* 失败兜底出口上的第二条补检预算。
*
@@ -1194,37 +1009,6 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
return deliverySupport().scheduleFallbackRecheck(task, result, facts);
}
private boolean completeLlmFileJob(FileTaskEntity task,
FileResultEntity result,
TaskFileJobEntity job,
int totalProgressUnits) {
int assembleProgress = Math.max(1, totalProgressUnits - 2);
saveFileBuildProgress(task, job, totalProgressUnits, assembleProgress, "正在组装 xlsx");
// 补检决定必须做在出表之前:assembleResultWorkbook 一跑完就把 xlsx 传上 OSS 并挂好
// resultFileUrl,那时才发现缺口,半张表已经在用户的下载列表里了。
if (requestRecheckForMissingRows(task, job, measureDeliveryFacts(task, result))) {
// 半张表先不发出去:撤销未完成行的检测标记、把作业排回队列补检一轮,
// 上限由行级轮次闸(llmRowMaxRounds)与补检轮次闸(recheckMaxRounds)共同兜住。
return false;
}
AppearancePatentRowOutcome.Facts deliveryFacts = assembleResultWorkbook(task, result);
saveFileBuildProgress(task, job, totalProgressUnits, totalProgressUnits - 1, "正在上传结果文件");
fileResultMapper.updateById(result);
boolean taskAlreadyFailed = STATUS_FAILED.equals(task.getStatus())
|| (task.getErrorMessage() != null && !task.getErrorMessage().isBlank());
String existingError = task.getErrorMessage();
task.setStatus(resolveTaskExecutionStatus(false, taskAlreadyFailed));
task.setSuccessFileCount(taskAlreadyFailed ? 0 : 1);
task.setFailedFileCount(taskAlreadyFailed ? 1 : 0);
task.setErrorMessage(appendDeliveryGapMessage(taskAlreadyFailed ? existingError : null, deliveryFacts));
task.setUpdatedAt(LocalDateTime.now());
task.setFinishedAt(LocalDateTime.now());
fileTaskMapper.updateById(task);
taskCacheService.deleteTaskCache(task.getId());
saveFileBuildProgress(task, job, totalProgressUnits, totalProgressUnits, "结果文件已生成");
return true;
}
/**
* 失败兜底:组装作业重试耗尽(WAIT_LLM 停放被 stuck 棘轮判死、或组装异常连吃 5 次重试)后调用,
* 用已回传的分片与已拿到结论的行尽力生成可下载的部分结果文件。
@@ -1244,62 +1028,11 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
* <p>实现自吞异常(兜底失败只记日志,不影响作业已终态失败的事实),返回是否有可下载结果。
*/
public boolean fallbackAssembleResultFile(TaskFileJobEntity job) {
if (job == null || job.getTaskId() == null || job.getResultId() == null) {
return false;
}
try {
FileResultEntity result = fileResultMapper.selectById(job.getResultId());
if (result == null || !TaskFinalizeSupport.belongsToModule(MODULE_TYPE, result.getModuleType())) {
log.warn("[appearance-patent] fallback assemble skipped because result record missing taskId={} resultId={}",
job.getTaskId(), job.getResultId());
return false;
}
if (result.getResultFileUrl() != null && !result.getResultFileUrl().isBlank()) {
log.info("[appearance-patent] fallback assemble skipped because result file already exists taskId={} resultId={} jobStatus={}",
job.getTaskId(), job.getResultId(), job.getStatus());
return true;
}
FileTaskEntity task = fileTaskMapper.selectById(job.getTaskId());
if (task == null || !TaskFinalizeSupport.belongsToModule(MODULE_TYPE, task.getModuleType())) {
log.warn("[appearance-patent] fallback assemble skipped because task missing taskId={} resultId={}",
job.getTaskId(), job.getResultId());
return false;
}
// 与 processResultFileJobLocked 同一判法:非归属实例让给归属机(stuck 扫描两台都在跑,
// 不挡的话每台都会每 60 秒重入一次兜底钩子)。
job.setScopeKey(buildTaskOwnerScopeKey(task));
if (!isJobOwnedByCurrentInstance(job)) {
log.info("[appearance-patent] fallback assemble skipped because owner is another instance taskId={} resultId={}",
job.getTaskId(), job.getResultId());
return false;
}
if (scheduleFallbackRecheck(task, result, measureDeliveryFacts(task, result))) {
return false;
}
AppearancePatentRowOutcome.Facts facts = assembleResultWorkbook(task, result, true);
fileResultMapper.updateById(result);
log.warn("[appearance-patent] fallback assemble produced partial result taskId={} resultId={} jobStatus={} expectedRows={} judgedRows={} missingRows={} noDataRows={}",
job.getTaskId(), job.getResultId(), job.getStatus(),
facts.expectedRows(), facts.judgedRows(), facts.missingRows(), facts.noDataRows());
return true;
} catch (Exception ex) {
log.warn("[appearance-patent] fallback assemble failed taskId={} resultId={} msg={}",
job.getTaskId(), job.getResultId(), ex.getMessage(), ex);
return false;
}
return resultJobSupport().fallbackAssembleResultFile(job);
}
private boolean isResultSubmissionComplete(Long taskId) {
if (taskId == null || taskId <= 0) {
return false;
}
Long count = taskScopeStateMapper.selectCount(new LambdaQueryWrapper<TaskScopeStateEntity>()
.eq(TaskScopeStateEntity::getTaskId, taskId)
.eq(TaskScopeStateEntity::getModuleType, MODULE_TYPE)
.isNull(TaskScopeStateEntity::getLlmStatus)
.isNotNull(TaskScopeStateEntity::getLastChunkAt)
.eq(TaskScopeStateEntity::getCompleted, 1));
return count != null && count > 0;
return resultJobSupport().isResultSubmissionComplete(taskId);
}
private void touchJavaSideTaskActivity(Long taskId) {
@@ -1357,144 +1090,14 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
}
public void cleanupResultFileJob(TaskFileJobEntity job) {
if (job == null || job.getTaskId() == null) {
return;
}
payloadSupport().deleteTransientTaskPayloads(job.getTaskId());
taskChunkMapper.delete(new LambdaQueryWrapper<TaskChunkEntity>()
.eq(TaskChunkEntity::getTaskId, job.getTaskId())
.eq(TaskChunkEntity::getModuleType, MODULE_TYPE));
taskScopeStateMapper.delete(new LambdaQueryWrapper<TaskScopeStateEntity>()
.eq(TaskScopeStateEntity::getTaskId, job.getTaskId())
.eq(TaskScopeStateEntity::getModuleType, MODULE_TYPE));
}
private AppearancePatentRowOutcome.Facts assembleResultWorkbook(FileTaskEntity task, FileResultEntity result) {
return assembleResultWorkbook(task, result, false);
}
/**
* @param allowPartial 供失败兜底路径({@link #fallbackAssembleResultFile})使用:
* 覆盖率闸门按「允许部分结果」放行——那条路在调用本方法前已经先问过
* {@link #scheduleFallbackRecheck},缺口能补的都补过了、补检预算也见底了,
* 此刻拦下成品只会让用户连半张表都拿不到;缺口仍由行账锚点记数。
*/
private AppearancePatentRowOutcome.Facts assembleResultWorkbook(FileTaskEntity task, FileResultEntity result,
boolean allowPartial) {
AppearancePatentParsedPayloadDto parsed = payloadSupport().readParsedPayload(task);
List<AppearancePatentParsedRowVo> parsedRows = parsed.getAllItems() == null
? List.of() : parsed.getAllItems();
List<AppearancePatentResultPackager.SourceRows> sourceRows = splitRowsBySourceFile(parsed, parsedRows, result.getSourceFilename());
if (sourceRows.isEmpty()) {
throw new BusinessException("外观专利检测结果为空,请稍后重试生成结果文件");
}
int receivedRowCount = 0;
long resolvedRows = 0L;
long reasonRows = 0L;
int conclusionPropagated = 0;
AppearancePatentRowOutcome.Facts deliveryFacts = AppearancePatentRowOutcome.Facts.EMPTY;
File outputDir = new File(storageProperties.getLocalTempDir(), "appearance-patent-result");
if (!outputDir.exists() && !outputDir.mkdirs()) {
throw new BusinessException("创建结果目录失败");
}
List<AppearancePatentResultPackager.SourceResultWorkbook> workbooks = new ArrayList<>();
File zip = null;
try {
for (AppearancePatentResultPackager.SourceRows item : sourceRows) {
Map<String, AppearancePatentResultRowDto> resultMap =
rowReader().loadPersistedResultRowsForRowsWithRetry(task.getId(), item.rows());
// 覆盖率先于「本文件无结果就跳过」判定:整源文件的 LLM 结果全丢(分片被跳过、
// 结果清空)时覆盖率是 0%,必须在这里判掉,不能让 zip 少一个文件还报任务成功。
deliveryFacts = deliveryFacts.plus(
validateCompleteLlmCoverage(task.getId(), item.rows(), resultMap, allowPartial));
List<AppearancePatentParsedRowVo> receivedRows = rowReader().filterReceivedParsedRows(item.rows(), resultMap);
if (receivedRows.isEmpty()) {
resultMap.clear();
continue;
}
receivedRowCount += receivedRows.size();
resolvedRows += receivedRows.stream()
.filter(row -> rowReader().findResultRow(row, resultMap) != null)
.count();
reasonRows += resultMap.values().stream()
.filter(this::hasReasonFields)
.count();
conclusionPropagated += GroupResultPropagator.propagateByGroup(
receivedRows,
AppearancePatentParsedRowVo::getDisplayId,
row -> rowReader().findResultRow(row, resultMap),
AppearancePatentResultRowDto::getConclusion,
AppearancePatentResultRowDto::setConclusion,
List.of("已侵权", "侵权"),
"[appearance-patent] taskId=" + task.getId()
);
String filename = safeFileStem(item.sourceFilename()) + "-result.xlsx";
String tempFilename = safeFileStem(item.sourceFilename())
+ "-" + task.getId()
+ "-" + result.getId()
+ "-" + UUID.randomUUID()
+ "-result.xlsx";
File xlsx = new File(outputDir, tempFilename);
writeResultWorkbook(xlsx, parsed, receivedRows, resultMap);
workbooks.add(new AppearancePatentResultPackager.SourceResultWorkbook(xlsx, filename, receivedRows.size()));
resultMap.clear();
}
if (workbooks.isEmpty()) {
throw new BusinessException("外观专利检测结果为空,请稍后重试生成结果文件");
}
log.info("[appearance-patent] assemble workbook taskId={} parsedRows={} receivedRows={} resultRows={} resolvedRows={} reasonRows={}",
task.getId(), parsedRows.size(), receivedRowCount,
workbooks.stream().mapToInt(AppearancePatentResultPackager.SourceResultWorkbook::rowCount).sum(), resolvedRows, reasonRows);
if (conclusionPropagated > 0) {
log.info("[appearance-patent] group propagate conclusion taskId={} updatedRows={}",
task.getId(), conclusionPropagated);
}
File uploadFile;
String filename;
String contentType;
if (workbooks.size() == 1) {
AppearancePatentResultPackager.SourceResultWorkbook workbook = workbooks.get(0);
uploadFile = workbook.file();
filename = workbook.filename();
contentType = CONTENT_TYPE_XLSX;
} else {
filename = safeFileStem(result.getSourceFilename()) + "-result.zip";
String tempFilename = safeFileStem(result.getSourceFilename())
+ "-" + task.getId()
+ "-" + result.getId()
+ "-" + UUID.randomUUID()
+ "-result.zip";
zip = new File(outputDir, tempFilename);
packageResultWorkbooksAsZip(zip, workbooks);
uploadFile = zip;
contentType = CONTENT_TYPE_ZIP;
}
String objectKey = ossStorageService.uploadResultFile(uploadFile, MODULE_TYPE);
result.setResultFilename(filename);
result.setResultFileUrl(objectKey);
result.setResultFileSize(uploadFile.length());
result.setResultContentType(contentType);
result.setRowCount(receivedRowCount);
return deliveryFacts;
} finally {
for (AppearancePatentResultPackager.SourceResultWorkbook workbook : workbooks) {
if (workbook.file().exists() && !workbook.file().delete()) {
log.warn("[appearance-patent] delete temp xlsx failed file={}", workbook.file());
}
}
if (zip != null && zip.exists() && !zip.delete()) {
log.warn("[appearance-patent] delete temp zip failed file={}", zip);
}
}
resultJobSupport().cleanupResultFileJob(job);
}
/**
* C 聚类·打包与命名住在 {@link AppearancePatentResultPackager}(3A 拆薄第四笔)。
* 无状态、按调用现取,与 {@code historyAssembler()} 同一先例,所以本笔不动构造器、不动装配。
* 三枚薄委托不是为了保住反射接缝(AP 的反射点名在 {@code writeResultWorkbook} 那一侧,
* 本笔搬的四枚方法没有被任何测试按名反射过),而是为了不让六个调用点跟着改形状。
* E 聚类出件后只剩 {@code splitRowsBySourceFile} 一枚薄委托(交付闸门量行账与出表共用);
* 打包、命名两枚随出表一起搬进 {@link AppearancePatentResultJobSupport}。
*/
private AppearancePatentResultPackager resultPackager() {
return new AppearancePatentResultPackager();
@@ -1507,15 +1110,6 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
return resultPackager().splitRowsBySourceFile(parsed, receivedRows, fallbackFilename);
}
private void packageResultWorkbooksAsZip(File zip,
List<AppearancePatentResultPackager.SourceResultWorkbook> workbooks) {
resultPackager().packageResultWorkbooksAsZip(zip, workbooks);
}
private String safeFileStem(String filename) {
return resultPackager().safeFileStem(filename);
}
/**
* 覆盖率判定:分母必须是**真正会写进结果文件的那批行**,且"该行有没有数据"要同时看
* 用户上传表的解析行与客户端回传的结果行——只看解析行,用户表不带标题列时分母恒为 0,
@@ -1545,19 +1139,7 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
AppearancePatentParsedPayloadDto parsed,
List<AppearancePatentParsedRowVo> receivedRows,
Map<String, AppearancePatentResultRowDto> resultMap) {
try (SXSSFWorkbook workbook = new SXSSFWorkbook(200); FileOutputStream fos = new FileOutputStream(xlsx)) {
AppearancePatentSheetBuilder.buildResultSheet(workbook, receivedRows, resultMap,
parsedRow -> rowReader().findResultRow(parsedRow, resultMap));
workbook.write(fos);
workbook.dispose();
} catch (Exception ex) {
throw new BusinessException("生成外观专利检测结果失败");
}
}
private boolean hasReasonFields(AppearancePatentResultRowDto row) {
return deliverySupport().hasReasonFields(row);
resultJobSupport().writeResultWorkbook(xlsx, parsed, receivedRows, resultMap);
}
@@ -0,0 +1,612 @@
package com.nanri.aiimage.modules.appearancepatent.service.support;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.task.TaskStatuses;
import com.nanri.aiimage.common.util.GroupResultPropagator;
import com.nanri.aiimage.config.AppearancePatentProperties;
import com.nanri.aiimage.config.StorageProperties;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentParsedPayloadDto;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentResultRowDto;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentSourceFileDto;
import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentParsedRowVo;
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskCacheService;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper;
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskChunkEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity;
import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
import com.nanri.aiimage.modules.task.service.TaskFileJobService;
import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import java.io.File;
import java.io.FileOutputStream;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
* 外观专利的结果作业生命周期与出表(E 聚类之二),从 {@code AppearancePatentTaskService}
* <b>原样搬移</b>(3A 拆薄第十一笔):作业取锁/归属/进度、终态收尾与结果记录补建、
* 失败兜底组装、覆盖率校验后的 xlsx/zip 出表与临时文件清理。
*
* <p>无状态、按调用现取(与 {@code historyAssembler()} 同一先例),不新增 Spring bean。
* 取锁、归属、进度、序列化、聚合命名与交付闸门由宿主以回调/委托交出。
*/
@Slf4j
public class AppearancePatentResultJobSupport {
private static final String STATUS_RUNNING = TaskStatuses.FileTask.RUNNING;
private static final String STATUS_FAILED = TaskStatuses.FileTask.FAILED;
private static final String CONTENT_TYPE_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
private static final String CONTENT_TYPE_ZIP = "application/zip";
private final String moduleType;
private final long lockWaitMillis;
private final AppearancePatentProperties properties;
private final StorageProperties storageProperties;
private final FileTaskMapper fileTaskMapper;
private final FileResultMapper fileResultMapper;
private final TaskScopeStateMapper taskScopeStateMapper;
private final TaskChunkMapper taskChunkMapper;
private final AppearancePatentTaskCacheService taskCacheService;
private final TaskFileJobService taskFileJobService;
private final OssStorageService ossStorageService;
private final AppearancePatentPayloadSupport payloadSupport;
private final AppearancePatentResultRowReader rowReader;
private final AppearancePatentResultPackager resultPackager;
private final AppearancePatentDeliverySupport deliverySupport;
private final AppearancePatentProgressSupport progressSupport;
private final AppearancePatentLlmBatchPipeline llmBatchPipeline;
private final AppearancePatentTaskOwnership ownership;
private final LockAcquirer lockAcquirer;
private final ActivityToucher activityToucher;
private final StatusResolver statusResolver;
private final FirstNonBlank firstNonBlank;
private final AggregateFilenameBuilder aggregateFilenameBuilder;
private final AggregateScopeKeyBuilder aggregateScopeKeyBuilder;
public interface LockAcquirer {
TaskDistributedLockService.LockHandle acquire(Long taskId, long waitMillis);
}
public interface ActivityToucher {
void touch(Long taskId);
}
public interface StatusResolver {
String resolve(boolean waitingForAssemble, boolean executionFailed);
}
public interface FirstNonBlank {
String pick(String preferred, String fallback);
}
public interface AggregateFilenameBuilder {
String build(List<AppearancePatentSourceFileDto> sourceFiles);
}
public interface AggregateScopeKeyBuilder {
String build(List<AppearancePatentSourceFileDto> sourceFiles);
}
public AppearancePatentResultJobSupport(String moduleType,
long lockWaitMillis,
AppearancePatentProperties properties,
StorageProperties storageProperties,
FileTaskMapper fileTaskMapper,
FileResultMapper fileResultMapper,
TaskScopeStateMapper taskScopeStateMapper,
TaskChunkMapper taskChunkMapper,
AppearancePatentTaskCacheService taskCacheService,
TaskFileJobService taskFileJobService,
OssStorageService ossStorageService,
AppearancePatentPayloadSupport payloadSupport,
AppearancePatentResultRowReader rowReader,
AppearancePatentResultPackager resultPackager,
AppearancePatentDeliverySupport deliverySupport,
AppearancePatentProgressSupport progressSupport,
AppearancePatentLlmBatchPipeline llmBatchPipeline,
AppearancePatentTaskOwnership ownership,
LockAcquirer lockAcquirer,
ActivityToucher activityToucher,
StatusResolver statusResolver,
FirstNonBlank firstNonBlank,
AggregateFilenameBuilder aggregateFilenameBuilder,
AggregateScopeKeyBuilder aggregateScopeKeyBuilder) {
this.moduleType = moduleType;
this.lockWaitMillis = lockWaitMillis;
this.properties = properties;
this.storageProperties = storageProperties;
this.fileTaskMapper = fileTaskMapper;
this.fileResultMapper = fileResultMapper;
this.taskScopeStateMapper = taskScopeStateMapper;
this.taskChunkMapper = taskChunkMapper;
this.taskCacheService = taskCacheService;
this.taskFileJobService = taskFileJobService;
this.ossStorageService = ossStorageService;
this.payloadSupport = payloadSupport;
this.rowReader = rowReader;
this.resultPackager = resultPackager;
this.deliverySupport = deliverySupport;
this.progressSupport = progressSupport;
this.llmBatchPipeline = llmBatchPipeline;
this.ownership = ownership;
this.lockAcquirer = lockAcquirer;
this.activityToucher = activityToucher;
this.statusResolver = statusResolver;
this.firstNonBlank = firstNonBlank;
this.aggregateFilenameBuilder = aggregateFilenameBuilder;
this.aggregateScopeKeyBuilder = aggregateScopeKeyBuilder;
}
public void maybeRecoverTerminalFailedAssemble(Long taskId) {
if (taskId == null || taskId <= 0) {
return;
}
try {
FileResultEntity result = findResultRecord(taskId);
if (result == null) {
return;
}
if (taskFileJobService.hasSuccessfulAssembleJob(taskId, moduleType, result.getId())) {
return;
}
if (!taskFileJobService.isTerminalFailedAssembleJob(taskId, moduleType, result.getId())) {
return;
}
if (!isResultSubmissionComplete(taskId)) {
log.info("[appearance-patent] 组装 job 终态失败但分片仍未补传完整,暂不恢复 taskId={} resultId={}",
taskId, result.getId());
return;
}
log.info("[appearance-patent] 分片已补传完整,恢复终态失败的组装 job taskId={} resultId={}",
taskId, result.getId());
taskFileJobService.resetTerminalFailedForRecovery(taskId, moduleType, result.getId());
} catch (Exception ex) {
log.warn("[appearance-patent] 补传恢复检查失败(不影响本次补传)taskId={} err={}", taskId, ex.getMessage(), ex);
}
}
/** 按 task 取结果行(不创建);不存在返回 null。 */
private FileResultEntity findResultRecord(Long taskId) {
List<FileResultEntity> rows = fileResultMapper.selectList(new LambdaQueryWrapper<FileResultEntity>()
.eq(FileResultEntity::getTaskId, taskId)
.eq(FileResultEntity::getModuleType, moduleType)
.last("limit 1"));
return rows == null || rows.isEmpty() ? null : rows.getFirst();
}
public void finalizeTask(FileTaskEntity task, String error, int rowCount, boolean assembleWorkbook) {
String finalError = error;
AppearancePatentRowOutcome.Facts deliveryFacts = AppearancePatentRowOutcome.Facts.EMPTY;
FileResultEntity result = null;
boolean persistedRowsPresent = rowReader.hasPersistedResultRows(task.getId());
List<FileResultEntity> rows = fileResultMapper.selectList(new LambdaQueryWrapper<FileResultEntity>()
.eq(FileResultEntity::getTaskId, task.getId())
.eq(FileResultEntity::getModuleType, moduleType)
.last("limit 1"));
if (!rows.isEmpty()) {
result = rows.getFirst();
} else if (assembleWorkbook && persistedRowsPresent) {
result = createResultRecordForAssembly(task, rowCount);
}
if (result != null) {
boolean shouldAssembleResult = assembleWorkbook && (finalError == null || finalError.isBlank() || persistedRowsPresent);
if (shouldAssembleResult && shouldAssembleSynchronously()) {
try {
deliveryFacts = assembleResultWorkbook(task, result);
} catch (Exception ex) {
log.warn("[appearance-patent] assemble result workbook failed taskId={} err={}", task.getId(), ex.getMessage());
finalError = firstNonBlank.pick(finalError, "Generate appearance patent result failed");
}
}
}
boolean failed = finalError != null && !finalError.isBlank();
boolean waitingForAssemble = !failed && assembleWorkbook && !shouldAssembleSynchronously();
task.setStatus(statusResolver.resolve(waitingForAssemble, failed));
task.setSuccessFileCount(failed ? 0 : 1);
task.setFailedFileCount(failed ? 1 : 0);
// 缺口只写在消息里,不参与 failed 计算:95% 以上有结论的单仍是成功,但用户要看得见"N 行没检测完"
task.setErrorMessage(deliverySupport.appendDeliveryGapMessage(finalError, deliveryFacts));
task.setUpdatedAt(LocalDateTime.now());
task.setFinishedAt(waitingForAssemble ? null : LocalDateTime.now());
fileTaskMapper.updateById(task);
if (result != null) {
result.setSuccess(failed ? 0 : 1);
result.setErrorMessage(finalError);
result.setRowCount(rowCount > 0 ? rowCount : result.getRowCount());
boolean shouldAssembleResult = assembleWorkbook && (!failed || persistedRowsPresent);
if (shouldAssembleResult) {
result.setResultFilename(resultPackager.safeFileStem(result.getSourceFilename()) + "-result.xlsx");
result.setResultFileUrl(null);
result.setResultFileSize(0L);
result.setResultContentType(CONTENT_TYPE_XLSX);
}
fileResultMapper.updateById(result);
if (shouldAssembleResult) {
enqueueResultAssembly(task, result, true);
} else if (assembleWorkbook && failed) {
log.warn("[appearance-patent] skip failed task workbook assembly because no persisted result rows taskId={}", task.getId());
}
}
taskCacheService.deleteTaskCache(task.getId());
}
public FileResultEntity findOrCreateResultRecordForAssembly(FileTaskEntity task, int rowCount) {
if (task == null || task.getId() == null) {
return null;
}
List<FileResultEntity> rows = fileResultMapper.selectList(new LambdaQueryWrapper<FileResultEntity>()
.eq(FileResultEntity::getTaskId, task.getId())
.eq(FileResultEntity::getModuleType, moduleType)
.last("limit 1"));
if (rows != null && !rows.isEmpty()) {
return rows.getFirst();
}
return createResultRecordForAssembly(task, rowCount);
}
private TaskFileJobEntity enqueueResultAssembly(FileTaskEntity task, FileResultEntity result, boolean dispatchWhenIdle) {
if (task == null || task.getId() == null || result == null || result.getId() == null) {
return null;
}
TaskFileJobEntity job = taskFileJobService.enqueueAssembleResult(
task.getId(), moduleType, result.getId(), ownership.buildTaskOwnerScopeKey(task));
if (dispatchWhenIdle
&& job != null
&& "RUNNING".equals(job.getStatus())) {
taskFileJobService.requeue(job.getId(), "Python upload finished, assembling xlsx");
}
return job;
}
private FileResultEntity createResultRecordForAssembly(FileTaskEntity task, int rowCount) {
AppearancePatentParsedPayloadDto payload = payloadSupport.readParsedPayload(task);
List<AppearancePatentSourceFileDto> sourceFiles = payload.getSourceFiles() == null ? List.of() : payload.getSourceFiles();
FileResultEntity result = new FileResultEntity();
result.setTaskId(task.getId());
result.setModuleType(moduleType);
result.setSourceFilename(aggregateFilenameBuilder.build(sourceFiles));
result.setSourceFileUrl(aggregateScopeKeyBuilder.build(sourceFiles));
result.setRowCount(rowCount > 0 ? rowCount : (payload.getAllItems() == null ? 0 : payload.getAllItems().size()));
result.setUserId(task.getUserId());
result.setCreatedAt(LocalDateTime.now());
fileResultMapper.insert(result);
log.warn("[appearance-patent] recreated missing result record for workbook assembly taskId={} resultId={}",
task.getId(), result.getId());
return result;
}
private boolean shouldAssembleSynchronously() {
return false;
}
public boolean processResultFileJob(TaskFileJobEntity job) {
if (job == null || job.getTaskId() == null || job.getResultId() == null) {
throw new BusinessException("结果文件作业参数不完整");
}
TaskDistributedLockService.LockHandle lockHandle = lockAcquirer.acquire(job.getTaskId(), lockWaitMillis);
if (lockHandle == null) {
taskFileJobService.requeue(job.getId(), "Task is busy, waiting for appearance patent result merge");
activityToucher.touch(job.getTaskId());
return false;
}
try (lockHandle) {
return processResultFileJobLocked(job);
}
}
private boolean processResultFileJobLocked(TaskFileJobEntity job) {
FileTaskEntity task = fileTaskMapper.selectById(job.getTaskId());
if (task == null || !moduleType.equals(task.getModuleType())) {
throw new BusinessException("任务不存在");
}
ownership.rejectIfOwnedByAnotherInstance(task, "assemble result file");
job.setScopeKey(ownership.buildTaskOwnerScopeKey(task));
if (!ownership.isOwnerCurrent(ownership.ownerFromScopeKey(job.getScopeKey()))) {
log.info("[appearance-patent] skip result file job because owner is another instance jobId={} taskId={} owner={} current={}",
job.getId(), job.getTaskId(), ownership.ownerFromScopeKey(job.getScopeKey()), ownership.currentInstanceId());
return false;
}
FileResultEntity result = fileResultMapper.selectById(job.getResultId());
if (result == null || !moduleType.equals(result.getModuleType())) {
throw new BusinessException("结果记录不存在");
}
// 已交付的作业不再重跑。Worker 那三处 SUCCESS 守卫挡不住这一格:结果文件已经挂上、
// 作业却被事件重投时它照样执行,而分片在交付时已被 cleanupResultFileJob 删掉,
// 重跑只能读到 0 行、连抛「结果为空」把 retry 预算烧满(2026-10-19 任务 31527:
// 23:02:35 交付,23:02:40→23:03:20 又跑五次,行账读数 expectedRows=0/coverage=100.00%
// 与那条抛同时出现——空集在闸门里是"通过",出表那边却是"没结果")。
// 与 fallbackAssembleResultFile 同一枚幂等闸。补传恢复不受影响:
// maybeRecoverTerminalFailedAssemble 自带 hasSuccessfulAssembleJob 早退,
// 而交付之后任务已终态,迟到分片被 rejectNotRunning 拒掉,没有合法的第二轮组装。
if (result.getResultFileUrl() != null && !result.getResultFileUrl().isBlank()) {
log.info("[appearance-patent] 结果文件已交付,跳过重复组装 taskId={} resultId={} jobId={}",
task.getId(), result.getId(), job.getId());
return true;
}
List<TaskChunkEntity> chunks = taskChunkMapper.selectList(new LambdaQueryWrapper<TaskChunkEntity>()
.eq(TaskChunkEntity::getTaskId, task.getId())
.eq(TaskChunkEntity::getModuleType, moduleType)
.orderByAsc(TaskChunkEntity::getChunkIndex));
int llmWorkUnits = llmBatchPipeline.countLlmWorkUnits(chunks, Math.max(1, properties.getLlmBatchSize()));
int plannedLlmUnits = Math.max(1, llmWorkUnits);
int totalProgressUnits = Math.max(3, plannedLlmUnits + 3);
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, 0, "正在提交检测");
llmBatchPipeline.submitLlmBatches(task, result, job, chunks);
if (STATUS_RUNNING.equals(task.getStatus()) && !isResultSubmissionComplete(task.getId())) {
taskFileJobService.touchRunning(job.getId());
activityToucher.touch(task.getId());
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, Math.max(1, plannedLlmUnits), "等待 Python 继续回传数据");
return false;
}
return completeLlmFileJob(task, result, job, totalProgressUnits);
}
private boolean completeLlmFileJob(FileTaskEntity task,
FileResultEntity result,
TaskFileJobEntity job,
int totalProgressUnits) {
int assembleProgress = Math.max(1, totalProgressUnits - 2);
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, assembleProgress, "正在组装 xlsx");
// 补检决定必须做在出表之前:assembleResultWorkbook 一跑完就把 xlsx 传上 OSS 并挂好
// resultFileUrl,那时才发现缺口,半张表已经在用户的下载列表里了。
if (deliverySupport.requestRecheckForMissingRows(task, job, deliverySupport.measureDeliveryFacts(task, result))) {
// 半张表先不发出去:撤销未完成行的检测标记、把作业排回队列补检一轮,
// 上限由行级轮次闸(llmRowMaxRounds)与补检轮次闸(recheckMaxRounds)共同兜住。
return false;
}
AppearancePatentRowOutcome.Facts deliveryFacts = assembleResultWorkbook(task, result);
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, totalProgressUnits - 1, "正在上传结果文件");
fileResultMapper.updateById(result);
boolean taskAlreadyFailed = STATUS_FAILED.equals(task.getStatus())
|| (task.getErrorMessage() != null && !task.getErrorMessage().isBlank());
String existingError = task.getErrorMessage();
task.setStatus(statusResolver.resolve(false, taskAlreadyFailed));
task.setSuccessFileCount(taskAlreadyFailed ? 0 : 1);
task.setFailedFileCount(taskAlreadyFailed ? 1 : 0);
task.setErrorMessage(deliverySupport.appendDeliveryGapMessage(taskAlreadyFailed ? existingError : null, deliveryFacts));
task.setUpdatedAt(LocalDateTime.now());
task.setFinishedAt(LocalDateTime.now());
fileTaskMapper.updateById(task);
taskCacheService.deleteTaskCache(task.getId());
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, totalProgressUnits, "结果文件已生成");
return true;
}
/**
* 失败兜底:组装作业重试耗尽(WAIT_LLM 停放被 stuck 棘轮判死、或组装异常连吃 5 次重试)后调用,
* 用已回传的分片与已拿到结论的行尽力生成可下载的部分结果文件。
*
* <p>用户线上点名要的保证:「起码失败了也可以下载」。判死时已跑完的检测结论仍挂在分片里,
* 不出表就一张都不剩(线上任务 31302:1196 行成品困在判死作业里零交付)。
*
* <p>覆盖率闸门按「允许部分结果」放行(缺口只记行账);任务状态在这里**不收尾**——判死时
* 任务可能仍在跑、客户端仍在心跳(stuck 棘轮只判作业、不判任务),提前置终态会把活任务误杀;
* 任务终态仍由 stale 收尾链路 / 分片回传链路按既有口径落。文件挂上 result(result_file_url)
* 后前端下载按钮即出现,与任务/作业状态无关({@code AppearancePatentHistoryAssembler#attachFileJobState})。
*
* <p>幂等:结果文件已存在(result_file_url 非空)直接返回 true,不重做组装——stuck 扫描对
* 终态失败作业每轮都会重入兜底钩子,靠这里挡住重复组装。与补传恢复(maybeRecoverTerminalFailedAssemble)
* 的重跑并发时两边都只写合法结果文件,后写者覆盖,无中间态。
*
* <p>实现自吞异常(兜底失败只记日志,不影响作业已终态失败的事实),返回是否有可下载结果。
*/
public boolean fallbackAssembleResultFile(TaskFileJobEntity job) {
if (job == null || job.getTaskId() == null || job.getResultId() == null) {
return false;
}
try {
FileResultEntity result = fileResultMapper.selectById(job.getResultId());
if (result == null || !TaskFinalizeSupport.belongsToModule(moduleType, result.getModuleType())) {
log.warn("[appearance-patent] fallback assemble skipped because result record missing taskId={} resultId={}",
job.getTaskId(), job.getResultId());
return false;
}
if (result.getResultFileUrl() != null && !result.getResultFileUrl().isBlank()) {
log.info("[appearance-patent] fallback assemble skipped because result file already exists taskId={} resultId={} jobStatus={}",
job.getTaskId(), job.getResultId(), job.getStatus());
return true;
}
FileTaskEntity task = fileTaskMapper.selectById(job.getTaskId());
if (task == null || !TaskFinalizeSupport.belongsToModule(moduleType, task.getModuleType())) {
log.warn("[appearance-patent] fallback assemble skipped because task missing taskId={} resultId={}",
job.getTaskId(), job.getResultId());
return false;
}
// 与 processResultFileJobLocked 同一判法:非归属实例让给归属机(stuck 扫描两台都在跑,
// 不挡的话每台都会每 60 秒重入一次兜底钩子)。
job.setScopeKey(ownership.buildTaskOwnerScopeKey(task));
if (!ownership.isOwnerCurrent(ownership.ownerFromScopeKey(job.getScopeKey()))) {
log.info("[appearance-patent] fallback assemble skipped because owner is another instance taskId={} resultId={}",
job.getTaskId(), job.getResultId());
return false;
}
if (deliverySupport.scheduleFallbackRecheck(task, result, deliverySupport.measureDeliveryFacts(task, result))) {
return false;
}
AppearancePatentRowOutcome.Facts facts = assembleResultWorkbook(task, result, true);
fileResultMapper.updateById(result);
log.warn("[appearance-patent] fallback assemble produced partial result taskId={} resultId={} jobStatus={} expectedRows={} judgedRows={} missingRows={} noDataRows={}",
job.getTaskId(), job.getResultId(), job.getStatus(),
facts.expectedRows(), facts.judgedRows(), facts.missingRows(), facts.noDataRows());
return true;
} catch (Exception ex) {
log.warn("[appearance-patent] fallback assemble failed taskId={} resultId={} msg={}",
job.getTaskId(), job.getResultId(), ex.getMessage(), ex);
return false;
}
}
public boolean isResultSubmissionComplete(Long taskId) {
if (taskId == null || taskId <= 0) {
return false;
}
Long count = taskScopeStateMapper.selectCount(new LambdaQueryWrapper<TaskScopeStateEntity>()
.eq(TaskScopeStateEntity::getTaskId, taskId)
.eq(TaskScopeStateEntity::getModuleType, moduleType)
.isNull(TaskScopeStateEntity::getLlmStatus)
.isNotNull(TaskScopeStateEntity::getLastChunkAt)
.eq(TaskScopeStateEntity::getCompleted, 1));
return count != null && count > 0;
}
public void cleanupResultFileJob(TaskFileJobEntity job) {
if (job == null || job.getTaskId() == null) {
return;
}
payloadSupport.deleteTransientTaskPayloads(job.getTaskId());
taskChunkMapper.delete(new LambdaQueryWrapper<TaskChunkEntity>()
.eq(TaskChunkEntity::getTaskId, job.getTaskId())
.eq(TaskChunkEntity::getModuleType, moduleType));
taskScopeStateMapper.delete(new LambdaQueryWrapper<TaskScopeStateEntity>()
.eq(TaskScopeStateEntity::getTaskId, job.getTaskId())
.eq(TaskScopeStateEntity::getModuleType, moduleType));
}
private AppearancePatentRowOutcome.Facts assembleResultWorkbook(FileTaskEntity task, FileResultEntity result) {
return assembleResultWorkbook(task, result, false);
}
/**
* @param allowPartial 供失败兜底路径({@code fallbackAssembleResultFile})使用:
* 覆盖率闸门按「允许部分结果」放行——那条路在调用本方法前已经先问过
* {@code scheduleFallbackRecheck},缺口能补的都补过了、补检预算也见底了,
* 此刻拦下成品只会让用户连半张表都拿不到;缺口仍由行账锚点记数。
*/
private AppearancePatentRowOutcome.Facts assembleResultWorkbook(FileTaskEntity task, FileResultEntity result,
boolean allowPartial) {
AppearancePatentParsedPayloadDto parsed = payloadSupport.readParsedPayload(task);
List<AppearancePatentParsedRowVo> parsedRows = parsed.getAllItems() == null
? List.of() : parsed.getAllItems();
List<AppearancePatentResultPackager.SourceRows> sourceRows = resultPackager.splitRowsBySourceFile(parsed, parsedRows, result.getSourceFilename());
if (sourceRows.isEmpty()) {
throw new BusinessException("外观专利检测结果为空,请稍后重试生成结果文件");
}
int receivedRowCount = 0;
long resolvedRows = 0L;
long reasonRows = 0L;
int conclusionPropagated = 0;
AppearancePatentRowOutcome.Facts deliveryFacts = AppearancePatentRowOutcome.Facts.EMPTY;
File outputDir = new File(storageProperties.getLocalTempDir(), "appearance-patent-result");
if (!outputDir.exists() && !outputDir.mkdirs()) {
throw new BusinessException("创建结果目录失败");
}
List<AppearancePatentResultPackager.SourceResultWorkbook> workbooks = new ArrayList<>();
File zip = null;
try {
for (AppearancePatentResultPackager.SourceRows item : sourceRows) {
Map<String, AppearancePatentResultRowDto> resultMap =
rowReader.loadPersistedResultRowsForRowsWithRetry(task.getId(), item.rows());
// 覆盖率先于「本文件无结果就跳过」判定:整源文件的 LLM 结果全丢(分片被跳过、
// 结果清空)时覆盖率是 0%,必须在这里判掉,不能让 zip 少一个文件还报任务成功。
deliveryFacts = deliveryFacts.plus(
deliverySupport.validateCompleteLlmCoverage(task.getId(), item.rows(), resultMap, allowPartial));
List<AppearancePatentParsedRowVo> receivedRows = rowReader.filterReceivedParsedRows(item.rows(), resultMap);
if (receivedRows.isEmpty()) {
resultMap.clear();
continue;
}
receivedRowCount += receivedRows.size();
resolvedRows += receivedRows.stream()
.filter(row -> rowReader.findResultRow(row, resultMap) != null)
.count();
reasonRows += resultMap.values().stream()
.filter(deliverySupport::hasReasonFields)
.count();
conclusionPropagated += GroupResultPropagator.propagateByGroup(
receivedRows,
AppearancePatentParsedRowVo::getDisplayId,
row -> rowReader.findResultRow(row, resultMap),
AppearancePatentResultRowDto::getConclusion,
AppearancePatentResultRowDto::setConclusion,
List.of("已侵权", "侵权"),
"[appearance-patent] taskId=" + task.getId()
);
String filename = resultPackager.safeFileStem(item.sourceFilename()) + "-result.xlsx";
String tempFilename = resultPackager.safeFileStem(item.sourceFilename())
+ "-" + task.getId()
+ "-" + result.getId()
+ "-" + UUID.randomUUID()
+ "-result.xlsx";
File xlsx = new File(outputDir, tempFilename);
writeResultWorkbook(xlsx, parsed, receivedRows, resultMap);
workbooks.add(new AppearancePatentResultPackager.SourceResultWorkbook(xlsx, filename, receivedRows.size()));
resultMap.clear();
}
if (workbooks.isEmpty()) {
throw new BusinessException("外观专利检测结果为空,请稍后重试生成结果文件");
}
log.info("[appearance-patent] assemble workbook taskId={} parsedRows={} receivedRows={} resultRows={} resolvedRows={} reasonRows={}",
task.getId(), parsedRows.size(), receivedRowCount,
workbooks.stream().mapToInt(AppearancePatentResultPackager.SourceResultWorkbook::rowCount).sum(), resolvedRows, reasonRows);
if (conclusionPropagated > 0) {
log.info("[appearance-patent] group propagate conclusion taskId={} updatedRows={}",
task.getId(), conclusionPropagated);
}
File uploadFile;
String filename;
String contentType;
if (workbooks.size() == 1) {
AppearancePatentResultPackager.SourceResultWorkbook workbook = workbooks.get(0);
uploadFile = workbook.file();
filename = workbook.filename();
contentType = CONTENT_TYPE_XLSX;
} else {
filename = resultPackager.safeFileStem(result.getSourceFilename()) + "-result.zip";
String tempFilename = resultPackager.safeFileStem(result.getSourceFilename())
+ "-" + task.getId()
+ "-" + result.getId()
+ "-" + UUID.randomUUID()
+ "-result.zip";
zip = new File(outputDir, tempFilename);
resultPackager.packageResultWorkbooksAsZip(zip, workbooks);
uploadFile = zip;
contentType = CONTENT_TYPE_ZIP;
}
String objectKey = ossStorageService.uploadResultFile(uploadFile, moduleType);
result.setResultFilename(filename);
result.setResultFileUrl(objectKey);
result.setResultFileSize(uploadFile.length());
result.setResultContentType(contentType);
result.setRowCount(receivedRowCount);
return deliveryFacts;
} finally {
for (AppearancePatentResultPackager.SourceResultWorkbook workbook : workbooks) {
if (workbook.file().exists() && !workbook.file().delete()) {
log.warn("[appearance-patent] delete temp xlsx failed file={}", workbook.file());
}
}
if (zip != null && zip.exists() && !zip.delete()) {
log.warn("[appearance-patent] delete temp zip failed file={}", zip);
}
}
}
public void writeResultWorkbook(File xlsx,
AppearancePatentParsedPayloadDto parsed,
List<AppearancePatentParsedRowVo> receivedRows,
Map<String, AppearancePatentResultRowDto> resultMap) {
try (SXSSFWorkbook workbook = new SXSSFWorkbook(200); FileOutputStream fos = new FileOutputStream(xlsx)) {
AppearancePatentSheetBuilder.buildResultSheet(workbook, receivedRows, resultMap,
parsedRow -> rowReader.findResultRow(parsedRow, resultMap));
workbook.write(fos);
workbook.dispose();
} catch (Exception ex) {
throw new BusinessException("生成外观专利检测结果失败");
}
}
}
@@ -266,13 +266,13 @@ class SourceScanTest {
// ---------------------------------------------------------------- N6 moduleSources
@Test
void moduleSources_appearancepatent返回37支含拆分后的support件() {
void moduleSources_appearancepatent返回38支含拆分后的support件() {
List<Path> files = SourceScan.moduleSources("modules/appearancepatent");
assertThat(files)
.as("真实集成:对真仓目录求值。37 支=1 controller+1 client+1 service 主件+3 spi/cache+"
+ "14 service/support+16 model(dto7/vo9),与 find 实测同号")
.hasSize(37);
.as("真实集成:对真仓目录求值。38 支=1 controller+1 client+1 service 主件+3 spi/cache+"
+ "15 service/support+16 model(dto7/vo9),与 find 实测同号")
.hasSize(38);
assertThat(files.stream().map(p -> p.toString().replace('\\', '/')).toList())
.as("support 目录里的既有件必须在面里——聚合入口存在的理由就是拆分后的新文件要自动被看到")
.anyMatch(rel -> rel.endsWith("service/support/AppearancePatentRowNormalizer.java"));
@@ -366,18 +366,18 @@ class SourceScanTest {
}
@Test
void recursive_包含service_support下的既有14件() {
void recursive_包含service_support下的既有15件() {
List<String> support = SourceScan.moduleSources("modules/appearancepatent").stream()
.map(p -> p.toString().replace('\\', '/'))
.filter(rel -> rel.contains("/service/support/"))
.toList();
assertThat(support)
.as("真实集成:对真仓 modules/appearancepatent/service/support 求值,实测 14 支(3A 拆薄把归属谓词、陈旧扫描、结果打包、LLM 批管线、载荷读写、结果行读取、进度视图、分片回传、交付闸门抽成九枚 support 件,5→14)。"
.as("真实集成:对真仓 modules/appearancepatent/service/support 求值,实测 15 支(3A 拆薄把归属谓词、陈旧扫描、结果打包、LLM 批管线、载荷读写、结果行读取、进度视图、分片回传、交付闸门、结果作业抽成十枚 support 件,5→15)。"
+ "这一格就是聚合入口存在的理由——拆分出去的新文件必须自动进面")
.hasSize(14);
.hasSize(15);
assertThat(support)
.as("3A 拆出去的九枚新件必须被逐枚点名扫到:只把分母数字改大,下一回拆件又只剩「数不对」"
.as("3A 拆出去的十枚新件必须被逐枚点名扫到:只把分母数字改大,下一回拆件又只剩「数不对」"
+ "一记红,证不了「扫得到」这件事")
.anyMatch(rel -> rel.endsWith("service/support/AppearancePatentTaskOwnership.java"))
.anyMatch(rel -> rel.endsWith("service/support/AppearancePatentStaleTaskScanner.java"))
@@ -387,7 +387,8 @@ class SourceScanTest {
.anyMatch(rel -> rel.endsWith("service/support/AppearancePatentResultRowReader.java"))
.anyMatch(rel -> rel.endsWith("service/support/AppearancePatentProgressSupport.java"))
.anyMatch(rel -> rel.endsWith("service/support/AppearancePatentChunkSubmissionSupport.java"))
.anyMatch(rel -> rel.endsWith("service/support/AppearancePatentDeliverySupport.java"));
.anyMatch(rel -> rel.endsWith("service/support/AppearancePatentDeliverySupport.java"))
.anyMatch(rel -> rel.endsWith("service/support/AppearancePatentResultJobSupport.java"));
}
@Test