fix(phase-2): B51-R1 收口——failure_category 落库+写点全接线+双读按文案优先

判死/重试/重开原先只读 biz_file_task.error_message 里的中文子串决定:改一句用户看得见的
文案=静默改一次整单生死,而且改的人不会知道。V186 补 failure_category(可空、存量不回填),
TaskFailureLedger 作为唯一写入口把「那次判断的结果」与文案同笔落库——词汇表仍只有
TaskRetryEligibility 一处,ledger 不抄第二份 markers(B52 那族的复发形状)。

- wrapper 面 22 处写点全部同笔派生写列;实体面接线第二批(外观专利 4/相似ASIN 4/采集 1),
  正是 DELIVERY/BALANCE 那几族被判死消费的文案
- 读侧 category(task) 取「文案判得出按文案、判不出才按列」:名单外的实体写点改文案带不动列,
  无条件读列=让一列陈旧判决判死当前这一单,那是本笔自己引入的漂移,比它要修的 bug 更糟
- FileTaskEntity.failureCategory 标 @TableField(updateStrategy = ALWAYS):updateById 默认跳过
  null 字段,「清错误」的分支会留下陈旧列;让 null 真落库,最坏只退回文案判定=加列前的今天
- 判据:TaskFailureCategoryGuardrailTest(5)+TaskFailureCategoryMigrationV186Test(5),已反向验证
  「删任一处配对即红」;SourceScanTest 台账裸名 24→25、调用方 17→18
- 门禁:mvn -o test 整量 5267/0 失败/0 错误/19 skipped;_push_gate.py full overall=pass

Contract 阶段(收 contains(<中文>) 判定)按蓝图登记留到读侧全切之后,本轮不动。
This commit is contained in:
2026-11-03 12:49:45 +08:00
parent 34f730d403
commit 51401de2d5
22 changed files with 588 additions and 12 deletions
@@ -26,6 +26,7 @@ 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.TaskRetryEligibility;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -227,6 +228,7 @@ public class AppearancePatentResultJobSupport {
task.setFailedFileCount(failed ? 1 : 0);
// 缺口只写在消息里,不参与 failed 计算:95% 以上有结论的单仍是成功,但用户要看得见"N 行没检测完"
task.setErrorMessage(deliverySupport.appendDeliveryGapMessage(finalError, deliveryFacts));
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
task.setUpdatedAt(LocalDateTime.now());
task.setFinishedAt(waitingForAssemble ? null : LocalDateTime.now());
fileTaskMapper.updateById(task);
@@ -295,6 +297,7 @@ public class AppearancePatentResultJobSupport {
task.setSuccessFileCount(0);
task.setFailedFileCount(1);
task.setErrorMessage(terminalMessage);
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
task.setUpdatedAt(LocalDateTime.now());
task.setFinishedAt(LocalDateTime.now());
fileTaskMapper.updateById(task);
@@ -472,6 +475,7 @@ public class AppearancePatentResultJobSupport {
task.setFailedFileCount(failed ? 1 : 0);
// 成功时也保留缺口文案:用户要看到“N 行抓取失败”,但不能因此把整单判死、逼他重跑。
task.setErrorMessage(deliverySupport.appendDeliveryGapMessage(existingError, deliveryFacts));
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
task.setUpdatedAt(LocalDateTime.now());
task.setFinishedAt(LocalDateTime.now());
fileTaskMapper.updateById(task);
@@ -488,6 +492,7 @@ public class AppearancePatentResultJobSupport {
boolean finalizeInterruptedDelivery(FileTaskEntity task, TaskFileJobEntity job, int totalProgressUnits,
String existingError, AppearancePatentRowOutcome.Facts deliveryFacts) {
task.setErrorMessage(deliverySupport.appendDeliveryGapMessage(existingError, deliveryFacts));
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
task.setUpdatedAt(LocalDateTime.now());
fileTaskMapper.updateById(task);
taskCacheService.deleteTaskCache(task.getId());
@@ -100,6 +100,7 @@ import com.nanri.aiimage.modules.task.model.vo.TaskProgressLightBatchVo;
import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler;
import com.nanri.aiimage.modules.task.service.StaleTaskHeartbeatPolicy;
import com.nanri.aiimage.modules.task.service.pipeline.AbstractFileTaskPipeline;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
@Service
@Slf4j
@@ -538,6 +539,7 @@ public class CollectDataService extends AbstractFileTaskPipeline<CollectDataResu
.notIn(FileTaskEntity::getStatus, STATUS_SUCCESS, STATUS_FAILED)
.set(FileTaskEntity::getStatus, STATUS_FAILED)
.set(FileTaskEntity::getErrorMessage, message)
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(message))
.set(FileTaskEntity::getFailedFileCount, 1)
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now())
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
@@ -1185,6 +1187,7 @@ public class CollectDataService extends AbstractFileTaskPipeline<CollectDataResu
fileResultMapper.updateById(result);
task.setStatus(STATUS_FAILED);
task.setErrorMessage(error);
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
task.setFailedFileCount(1);
task.setUpdatedAt(LocalDateTime.now());
task.setFinishedAt(LocalDateTime.now());
@@ -1262,6 +1265,7 @@ public class CollectDataService extends AbstractFileTaskPipeline<CollectDataResu
// 「保留 N 行」永远停在组装前的插入计数(task 31253:表里 0 行仍显示 93)。
.set(FileTaskEntity::getResultJson, task.getResultJson())
.set(FileTaskEntity::getErrorMessage, null)
.set(FileTaskEntity::getFailureCategory, null)
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now())
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
if (updated == 0) {
@@ -56,6 +56,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
@Service
@Slf4j
@@ -457,6 +458,7 @@ public class DedupeRunService {
.eq(FileTaskEntity::getStatus, "RUNNING")
.set(FileTaskEntity::getStatus, "FAILED")
.set(FileTaskEntity::getErrorMessage, BOOT_INTERRUPTED_MESSAGE)
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(BOOT_INTERRUPTED_MESSAGE))
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now())
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now()));
if (updated <= 0) {
@@ -49,6 +49,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
@Service
@RequiredArgsConstructor
@@ -296,6 +297,7 @@ public class DeleteBrandStaleTaskService {
.eq(FileTaskEntity::getStatus, "RUNNING")
.set(FileTaskEntity::getStatus, "FAILED")
.set(FileTaskEntity::getErrorMessage, buildStaleFailReason(task, entry, minutes, nowMillis))
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(buildStaleFailReason(task, entry, minutes, nowMillis)))
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now())
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
@@ -418,6 +420,7 @@ public class DeleteBrandStaleTaskService {
.eq(FileTaskEntity::getStatus, "RUNNING")
.set(FileTaskEntity::getStatus, "FAILED")
.set(FileTaskEntity::getErrorMessage, "长时间未收到 Python 结果回传,任务已自动失败")
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf("长时间未收到 Python 结果回传,任务已自动失败"))
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now())
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
if (updated > 0) {
@@ -496,6 +499,7 @@ public class DeleteBrandStaleTaskService {
.eq(FileTaskEntity::getStatus, "RUNNING")
.set(FileTaskEntity::getStatus, "FAILED")
.set(FileTaskEntity::getErrorMessage, "长时间未收到 Python 结果回传,任务已自动失败")
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf("长时间未收到 Python 结果回传,任务已自动失败"))
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now())
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
if (updated > 0) {
@@ -577,6 +581,7 @@ public class DeleteBrandStaleTaskService {
.eq(FileTaskEntity::getStatus, "RUNNING")
.set(FileTaskEntity::getStatus, "FAILED")
.set(FileTaskEntity::getErrorMessage, "长时间未收到 Python 结果回传,任务已自动失败")
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf("长时间未收到 Python 结果回传,任务已自动失败"))
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now())
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
if (updated > 0) {
@@ -654,6 +659,7 @@ public class DeleteBrandStaleTaskService {
.eq(FileTaskEntity::getStatus, "RUNNING")
.set(FileTaskEntity::getStatus, "FAILED")
.set(FileTaskEntity::getErrorMessage, "长时间未收到 Python 结果回传,任务已自动失败")
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf("长时间未收到 Python 结果回传,任务已自动失败"))
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now())
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
if (updated > 0) {
@@ -730,6 +736,7 @@ public class DeleteBrandStaleTaskService {
.eq(FileTaskEntity::getStatus, "RUNNING")
.set(FileTaskEntity::getStatus, "FAILED")
.set(FileTaskEntity::getErrorMessage, "长时间未收到 Python 结果回传,任务已自动失败")
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf("长时间未收到 Python 结果回传,任务已自动失败"))
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now())
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
if (updated > 0) {
@@ -791,6 +798,7 @@ public class DeleteBrandStaleTaskService {
.eq(FileTaskEntity::getStatus, "RUNNING")
.set(FileTaskEntity::getStatus, "FAILED")
.set(FileTaskEntity::getErrorMessage, "长时间未收到 Python 结果回传,任务已自动失败")
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf("长时间未收到 Python 结果回传,任务已自动失败"))
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now())
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
if (updated > 0) {
@@ -908,6 +916,7 @@ public class DeleteBrandStaleTaskService {
.eq(FileTaskEntity::getStatus, "RUNNING")
.set(FileTaskEntity::getStatus, "FAILED")
.set(FileTaskEntity::getErrorMessage, buildNoResultUploadFailReason(minutes, lastResultAt, lastPosition))
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(buildNoResultUploadFailReason(minutes, lastResultAt, lastPosition)))
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now())
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
if (updated > 0) {
@@ -81,6 +81,7 @@ import java.util.UUID;
import java.util.function.Supplier;
import com.nanri.aiimage.modules.task.model.vo.TaskProgressLightBatchVo;
import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
@Service
@Slf4j
@@ -265,6 +266,7 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline<ShopDataC
.eq(FileTaskEntity::getStatus, "RUNNING")
.set(FileTaskEntity::getStatus, "FAILED")
.set(FileTaskEntity::getErrorMessage, errorMessage)
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(errorMessage))
.set(FileTaskEntity::getUpdatedAt, now)
.set(FileTaskEntity::getFinishedAt, now));
if (updated <= 0) {
@@ -72,6 +72,7 @@ import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService;
import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
import com.nanri.aiimage.modules.task.service.TaskRetryEligibility;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
import com.nanri.aiimage.modules.task.service.TaskVisibleFailureNotice;
import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService;
import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService;
@@ -1356,6 +1357,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
task.setSuccessFileCount(failed ? 0 : 1);
task.setFailedFileCount(failed ? 1 : 0);
task.setErrorMessage(finalError);
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
task.setUpdatedAt(LocalDateTime.now());
task.setFinishedAt(waitingForAssemble ? null : LocalDateTime.now());
fileTaskMapper.updateById(task);
@@ -1567,6 +1569,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
task.setSuccessFileCount(0);
task.setFailedFileCount(1);
task.setErrorMessage(failureMessage);
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
task.setUpdatedAt(now);
task.setFinishedAt(now);
fileTaskMapper.updateById(task);
@@ -1616,9 +1619,11 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
task.setFailedFileCount(1);
// 生产者原文一个字都不在这里重写(支持同学要对着上游响应体查根因);界面上那句中文由
// TaskVisibleFailureNotice 在出口处给,英文原文与上游账户号不进界面。
task.setErrorMessage(raw.isEmpty()
String terminalText = raw.isEmpty()
? LlmBalanceGuard.TASK_TERMINAL_GUIDANCE
: raw + ";" + LlmBalanceGuard.TASK_TERMINAL_GUIDANCE);
: raw + ";" + LlmBalanceGuard.TASK_TERMINAL_GUIDANCE;
task.setErrorMessage(terminalText);
task.setFailureCategory(TaskFailureLedger.categoryOf(terminalText));
task.setUpdatedAt(LocalDateTime.now());
task.setFinishedAt(LocalDateTime.now());
fileTaskMapper.updateById(task);
@@ -1684,6 +1689,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
task.setSuccessFileCount(taskAlreadyFailed ? 0 : 1);
task.setFailedFileCount(taskAlreadyFailed ? 1 : 0);
task.setErrorMessage(taskAlreadyFailed ? existingError : null);
task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage()));
task.setUpdatedAt(LocalDateTime.now());
task.setFinishedAt(LocalDateTime.now());
fileTaskMapper.updateById(task);
@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.List;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
/**
* SimilarAsinTaskService 拆分:心跳/回传停滞判死的迟到回传恢复。
@@ -96,6 +97,7 @@ public class SimilarAsinStaleReopenSupport {
.eq(FileTaskEntity::getErrorMessage, reason)
.set(FileTaskEntity::getStatus, TaskStatuses.FileTask.RUNNING)
.set(FileTaskEntity::getErrorMessage, null)
.set(FileTaskEntity::getFailureCategory, null)
.set(FileTaskEntity::getFinishedAt, null)
.set(FileTaskEntity::getSuccessFileCount, 0)
.set(FileTaskEntity::getFailedFileCount, 0)
@@ -1,6 +1,8 @@
package com.nanri.aiimage.modules.task.model.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -25,6 +27,20 @@ public class FileTaskEntity {
private String requestJson;
private String resultJson;
private String errorMessage;
/**
* 失败分类(V186):值={@code TaskRetryEligibility.Category.name()},空=这一行没登记分类。
*
* <p>存在理由:重试/重开/判死原先全靠读 {@code error_message} 里的中文子串决定,
* 改一句用户可见文案就静默改行为。列是那次判断的**记账**,不是第二套词汇表——
* 写入一律经 {@code TaskFailureLedger},词汇表仍只有 {@code TaskRetryEligibility} 一处。
*
* <p>{@code updateStrategy=ALWAYS} 是给实体式写面兜底的:{@code updateById} 默认跳过 null 字段,
* 而 {@code task.setErrorMessage(null)} 这类「清错误」的分支带不动列,会留下一列<b>陈旧</b>的判决。
* 让 null 真的落库,最坏情形就是列被抹回「未登记」——读侧按文案判定,逐字等于加列之前的今天;
* 反过来(陈旧列活下来)才是会让一单被上一次失败原因判死的那种错。
*/
@TableField(updateStrategy = FieldStrategy.ALWAYS)
private String failureCategory;
private String createdBy;
private Long userId;
/** 创建任务的客户端设备(JWT 签名 deviceId claim,V138);历史任务为空。 */
@@ -21,6 +21,7 @@ import java.time.LocalDateTime;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
/**
* 账号过期停任务巡检(V146,2026-10-05)。
@@ -147,6 +148,7 @@ public class ExpiredAccountTaskStopService {
.in(FileTaskEntity::getStatus, STATUS_PENDING, STATUS_SCHEDULED, STATUS_RUNNING)
.set(FileTaskEntity::getStatus, STATUS_FAILED)
.set(FileTaskEntity::getErrorMessage, STOP_REASON)
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(STOP_REASON))
.set(FileTaskEntity::getFinishedAt, now));
}
}
@@ -35,6 +35,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
@Slf4j
@Service
@@ -332,7 +333,8 @@ public class ModuleHistoryCleanupService {
.in(FileTaskEntity::getId, cleanupTaskIds)
.set(FileTaskEntity::getResultJson, null)
.set(FileTaskEntity::getRequestJson, null)
.set(FileTaskEntity::getErrorMessage, null));
.set(FileTaskEntity::getErrorMessage, null)
.set(FileTaskEntity::getFailureCategory, null));
return fileTaskMapper.delete(new LambdaQueryWrapper<FileTaskEntity>()
.in(FileTaskEntity::getId, cleanupTaskIds));
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
/**
* 陈旧任务自动修复。
@@ -104,6 +105,7 @@ public class StaleTaskRepairService {
.eq(FileTaskEntity::getStatus, STATUS_SCHEDULED)
.set(FileTaskEntity::getStatus, STATUS_FAILED)
.set(FileTaskEntity::getErrorMessage, reason)
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(reason))
.set(FileTaskEntity::getFinishedAt, now));
if (updated > 0) {
log.warn("[stale-task-repair] 陈旧定时任务已标失败 count={} ids={}", updated, ids);
@@ -135,6 +137,7 @@ public class StaleTaskRepairService {
.eq(FileTaskEntity::getStatus, STATUS_RUNNING)
.set(FileTaskEntity::getStatus, STATUS_FAILED)
.set(FileTaskEntity::getErrorMessage, reason)
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(reason))
.set(FileTaskEntity::getFinishedAt, now));
if (updated > 0) {
log.warn("[stale-task-repair] 心跳超时 RUNNING 已标失败 count={} ids={}", updated, ids);
@@ -21,6 +21,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
/**
* 客户端兜底拉取:把"页面没推送成功、长期停在 PENDING"的任务交给在线客户端执行。
@@ -283,6 +284,7 @@ public class TaskClientPullService {
.eq(FileTaskEntity::getStatus, STATUS_RUNNING)
.set(FileTaskEntity::getStatus, STATUS_FAILED)
.set(FileTaskEntity::getErrorMessage, reason)
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(reason))
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
log.warn("[client-task-pull] 认领后组装载荷失败,已标失败 taskId={} moduleType={} 命中={} 原因={}",
task.getId(), task.getModuleType(), updated, reason);
@@ -18,6 +18,7 @@ import java.time.LocalDateTime;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
/**
* 任务心跳入口。
@@ -173,6 +174,7 @@ public class TaskHeartbeatService {
.eq(FileTaskEntity::getStatus, STATUS_RUNNING)
.set(FileTaskEntity::getStatus, "FAILED")
.set(FileTaskEntity::getErrorMessage, safeReason)
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(safeReason))
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
if (updated > 0) {
log.warn("[task-interrupted] file task marked failed by client restart taskId={} moduleType={} reason={}",
@@ -231,6 +233,7 @@ public class TaskHeartbeatService {
.in(FileTaskEntity::getStatus, TaskStatuses.FileTask.ACTIVE_ORDERED)
.set(FileTaskEntity::getStatus, TaskStatuses.FileTask.CANCELLED)
.set(FileTaskEntity::getErrorMessage, message)
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(message))
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
if (updated > 0) {
log.warn("[task-cancel] file task cancelled by user taskId={} moduleType={}",
@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
/**
* 失败/中断任务「在原任务上重试/继续」的唯一出口(2026-11-01 用户拍板失败重试;
@@ -81,6 +82,7 @@ public class TaskInPlaceRetryService {
.in(FileTaskEntity::getStatus, STATUS_FAILED, STATUS_CANCELLED)
.set(FileTaskEntity::getStatus, STATUS_PENDING)
.set(FileTaskEntity::getErrorMessage, null)
.set(FileTaskEntity::getFailureCategory, null)
.set(FileTaskEntity::getFinishedAt, null)
.set(FileTaskEntity::getResumeAttempt, attempt + 1)
.set(FileTaskEntity::getUpdatedAt, now));
@@ -19,6 +19,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger;
/**
* 失败任务的自动重试:把仍可执行的原任务**克隆**成一条新的 PENDING 任务,最多重试 3 代。
@@ -213,7 +214,9 @@ public class TaskResumeService {
continue;
}
TaskRetryEligibility.Category notRetryable =
TaskRetryEligibility.forceMajeureCategory(original.getErrorMessage());
// 双读(B51-R1):这行登记过分类就以列为准,没登记才回落到文案——自动续跑
// 是每天真在跑的判死面,不该让"某句话改了措辞"在这种地方动摇历史行的判定。
TaskRetryEligibility.category(original);
if (notRetryable != null) {
stats.forceMajeureSkippedCount++;
// 这句不再自称"不可抗力":category=STOPPED 是我们自己停的,写成不可抗力会把运维
@@ -360,6 +363,7 @@ public class TaskResumeService {
.in(FileTaskEntity::getStatus, LIVE_STATUSES)
.set(FileTaskEntity::getStatus, STATUS_FAILED)
.set(FileTaskEntity::getErrorMessage, DUPLICATE_STOP_REASON)
.set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(DUPLICATE_STOP_REASON))
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now())
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now()));
if (updated == 1) {
@@ -1,5 +1,7 @@
package com.nanri.aiimage.modules.task.service;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import java.util.List;
import java.util.Locale;
@@ -119,6 +121,50 @@ public final class TaskRetryEligibility {
return category == null ? "" : category.label();
}
/**
* 双读入口(B51-R1 的 Expand 半边):文案还判得出就按文案,判不出才轮到
* {@code biz_file_task.failure_category} 里登记的那一笔。
*
* <p>列是「那次判断的结果」,文案是「给人看的一句话」——判生死不该挂在一句话的措辞上,
* 所以措辞漂移到 markers 认不出时,判决仍由列钉在原处。存量行的列一律为空,回落就是
* 切换前的口径,行为逐字不变。
*
* <p><b>为什么不写成「有列就无条件读列」</b>:{@code setErrorMessage} 的实体式写入面
* (若干 {@code task.setErrorMessage(...)} + {@code updateById})本轮还没接
* {@code TaskFailureLedger},它改文案时带不动列(MyBatis-Plus 默认不更新 null 字段),
* 于是同一行会出现「列记着上一次判决、文案已是另一次失败」。那种背离里列是<b>陈旧</b>的:
* 无条件读列等于让一个已经不代表当前失败原因的值判死这一单——那是本笔改动自己引入的行为漂移,
* 比它要修的 bug 更糟。两者都能判出却不同类时按文案读,逐字等于加列之前的今天。
*
* <p>不在值域内的字符串按「没登记」处理并回落,<b>不</b>写成 {@code valueOf} + catch:
* 静默 catch 会计入 {@code CatchSilenceRatchetTest} 的总数上限(铁律 19 的 2026-10-31 实录,
* 加 2 处就把后端整量打红),逐值比对同样不抛。
*/
public static Category category(FileTaskEntity task) {
if (task == null) {
return null;
}
Category fromMessage = forceMajeureCategory(task.getErrorMessage());
if (fromMessage != null) {
return fromMessage;
}
return categoryByName(task.getFailureCategory());
}
/** 按值逐个比对枚举名;空串或不在值域内一律返回 null(=未登记),不抛异常。 */
public static Category categoryByName(String raw) {
if (raw == null || raw.isBlank()) {
return null;
}
String name = raw.trim();
for (Category category : Category.values()) {
if (category.name().equals(name)) {
return category;
}
}
return null;
}
private static boolean containsAny(String text, List<String> markers) {
for (String marker : markers) {
if (text.contains(marker)) {
@@ -0,0 +1,31 @@
package com.nanri.aiimage.modules.task.service.support;
import com.nanri.aiimage.modules.task.service.TaskRetryEligibility;
/**
* 任务失败分类的<b>写入口</b>(B51-R1,{@code docs/REFACTOR_PLAN.md} §3.1)。
*
* <p>它只做一件事:把「这段文案属于哪一类」的判断<b>结果</b>记进
* {@code biz_file_task.failure_category},与文案同笔落库。判定逻辑本身仍然只有
* {@link TaskRetryEligibility} 一处——本类不复制词汇表,否则就又造出一个第二正本(B52 那一族)。
*
* <p>为什么列和文案要同时写:判死/重试/重开原先只读中文子串,改一句用户看得见的文案就
* 静默改一次整单生死。列落下之后,读侧「文案判得出按文案、判不出按列」,文案怎么改都不再动摇已登记的判定。
*
* <p>返回 {@code null} 有两种来源,读侧同待:① 文案确实不属于任何一类(普通可重试失败);
* ② 这一行还没接上本出口(实体式写入面,Contract 阶段之前分批补齐)。<b>不许</b>把空列读成
* 「分类为 UNKNOWN」——那会让存量行在切换日集体变成一种新状态。实体式 {@code setErrorMessage}
* 改文案时带不动列(MyBatis-Plus 默认不更新 null 字段),所以那一面在接上 ledger 之前会出现
* 「列记着上一次判决、文案已是另一次失败」的背离;读侧按文案优先,正是为了不让这种陈旧列判死这一单。
*/
public final class TaskFailureLedger {
private TaskFailureLedger() {
}
/** 由失败文案推出分类名({@code TaskRetryEligibility.Category.name()});判不出返回 null。 */
public static String categoryOf(String errorMessage) {
TaskRetryEligibility.Category category = TaskRetryEligibility.forceMajeureCategory(errorMessage);
return category == null ? null : category.name();
}
}
@@ -0,0 +1,30 @@
-- V186: 任务失败分类列(B51-R1,Expand-and-Contract 的 Expand 半边)
--
-- 背景(蓝图 docs/REFACTOR_PLAN.md §3.1,立项自 docs/audit/SLIMMING_REPORT.md 的 B51):
-- 重试/重开/判死全部读 `biz_file_task.error_message` 里的**中文子串**决定
-- (TaskRetryEligibility 六组 markers、TaskResultFileJobWorker 的孤儿判死、
-- SimilarAsinStaleReopenSupport 的重开白名单)。后果是"改一句用户看得见的文案"=
-- 静默改一次整单生死,而且改的人不会知道——文案是给看的,判定是拿它当枚举用的。
--
-- 设计口径:
-- * 可空:NULL=「这一行没登记分类」。存量行一律不回填(历史行的文案还在,读侧照旧能判),
-- 实体式写入面(若干 `task.setErrorMessage(...)`)本轮尚未接 ledger,落库时列为空——
-- 这两种 NULL 都是**有意的**,读侧按「文案判得出按文案、判不出按列」双读(列与文案背离时
-- 列是陈旧的,按文案才等于加列之前的行为),不许把空列读成「无类别」;
-- * 不自造第二套词汇表:值域就是 `TaskRetryEligibility.Category.name()`
-- (BALANCE/SERVICE_DOWN/CREDENTIAL/DELIVERY/STOPPED),判定逻辑仍只有那一处;
-- * VARCHAR(16) 与 V183 的 `collect_channel` 同档:五个枚举名最长 12(SERVICE_DOWN),
-- 留余量给后续分类名,不用 ENUM(ENUM 改值域要再发一次迁移,且 MyBatis 侧映射成字符串更直白);
-- * 不加索引:这一列现在只被"读某一行的分类"用到(按主键),没有按分类筛整表的查询;
-- 真要按类别统计再说,别让一条推测性索引进基线。
--
-- Contract 阶段(本轮**不做**,读侧全切之后才许动):
-- 把 `contains("<中文>")` 那批判定收掉,并让 `TaskFailureCategoryGuardrailTest`
-- 的"文案写点必须同笔写列"绊线继续守着新增点。
--
-- 回滚(手工):
-- ALTER TABLE `biz_file_task` DROP COLUMN `failure_category`;
ALTER TABLE `biz_file_task`
ADD COLUMN `failure_category` VARCHAR(16) NULL
COMMENT '失败分类(TaskRetryEligibility.Category 值域):空=未登记,读侧回落到 error_message 文案判定' AFTER `error_message`;