diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java index 7147b9e53..8fd218cee 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java @@ -296,6 +296,7 @@ public class DeleteBrandRunService extends AbstractFileTaskPipeline 0 ? "全部文件解析或匹配失败" : null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setFinishedAt(LocalDateTime.now()); persist.set(FileTaskEntity::getStatus, task.getStatus()) .set(FileTaskEntity::getErrorMessage, task.getErrorMessage()) @@ -1174,6 +1175,7 @@ public class DeleteBrandRunService extends AbstractFileTaskPipeline 0 && "FAILED".equals(task.getStatus())) { task.setStatus("RUNNING"); task.setErrorMessage(null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setFinishedAt(null); } fileTaskMapper.updateById(task); @@ -1408,6 +1410,7 @@ public class DeleteBrandRunService extends AbstractFileTaskPipeline { task.setStatus("RUNNING"); task.setErrorMessage(null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setUpdatedAt(LocalDateTime.now()); task.setFinishedAt(null); fileTaskMapper.updateById(task); @@ -1655,9 +1658,13 @@ public class DeleteBrandRunService extends AbstractFileTaskPipeline 0 ? "FAILED" : "SUCCESS"); task.setSuccessFileCount(successCount); task.setFailedFileCount(failedCount); - task.setErrorMessage(failedCount > 0 + // 文案先落进局部变量:配对判据是「setErrorMessage 的下一行」(护栏第五格的书写形状), + // 把三元表达式拆成跨三行的 set 会让那一格看不见配对(第三批实测踩点,不放宽判据)。 + String autoFinalizeMessage = failedCount > 0 ? (successCount > 0 ? "部分结果文件生成失败,已按结果行状态自动收尾" : "任务中间数据缺失,已按结果行状态自动收尾") - : null); + : null; + task.setErrorMessage(autoFinalizeMessage); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setUpdatedAt(LocalDateTime.now()); task.setFinishedAt(LocalDateTime.now()); fileTaskMapper.updateById(task); @@ -1837,6 +1844,7 @@ public class DeleteBrandRunService extends AbstractFileTaskPipeline 0 ? failedCount + " 个结果文件生成失败" : null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setResultJson(toCompactTaskResultJsonForDb(finalItems)); task.setUpdatedAt(LocalDateTime.now()); task.setFinishedAt(waitingForAssemble ? null : LocalDateTime.now()); @@ -1854,6 +1862,7 @@ public class DeleteBrandRunService extends AbstractFileTaskPipeline 0 ? "FAILED" : "SUCCESS"); @@ -811,8 +813,10 @@ public class PatrolDeleteTaskService { } } task.setErrorMessage(String.join("; ", errors)); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); } else { task.setErrorMessage(null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskService.java index 522b52078..55a752b3a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskService.java @@ -33,6 +33,7 @@ import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport; import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService; import com.nanri.aiimage.modules.task.service.TaskResultItemService; import com.nanri.aiimage.modules.task.service.TaskResultPayloadService; +import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger; import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; @@ -401,10 +402,12 @@ public class ProductRiskTaskService { if (!allDone) { task.setStatus("RUNNING"); task.setErrorMessage(null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setFinishedAt(null); } else if (ok > 0 && fail == 0) { task.setStatus("SUCCESS"); task.setErrorMessage(null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setFinishedAt(LocalDateTime.now()); } else if (ok > 0) { // 与 updateTaskStatusFromLatestRows 同一口径:部分店铺失败 = 结果不完整, @@ -412,10 +415,12 @@ public class ProductRiskTaskService { // 删一条无关键结果行就会把已判 FAILED 的部分失败任务翻回「成功」 task.setStatus("FAILED"); task.setErrorMessage(String.join("; ", allErrors)); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setFinishedAt(LocalDateTime.now()); } else { task.setStatus("FAILED"); task.setErrorMessage(allErrors.isEmpty() ? "全部店铺处理失败" : String.join("; ", allErrors)); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setFinishedAt(LocalDateTime.now()); } try { @@ -1000,10 +1005,12 @@ public class ProductRiskTaskService { if (!allDone) { task.setStatus("RUNNING"); task.setErrorMessage(null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setFinishedAt(null); } else if (ok > 0 && fail == 0) { task.setStatus("SUCCESS"); task.setErrorMessage(null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setFinishedAt(LocalDateTime.now()); } else if (ok > 0) { // 部分店铺失败 = 结果不完整,如实标 FAILED 并写明原因(失败店铺已跑出来的行 @@ -1012,10 +1019,12 @@ public class ProductRiskTaskService { // 即此类;语义与跟价 4.0.26「任务没跑完如实报失败」一致 task.setStatus("FAILED"); task.setErrorMessage(String.join("; ", allErrors.isEmpty() ? batchErrors : allErrors)); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setFinishedAt(LocalDateTime.now()); } else { task.setStatus("FAILED"); task.setErrorMessage(allErrors.isEmpty() ? "all shops failed" : String.join("; ", allErrors)); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setFinishedAt(LocalDateTime.now()); } try { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java index 8f4237e05..6c833dc8a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java @@ -32,6 +32,7 @@ import com.nanri.aiimage.modules.task.service.TaskFileJobService; import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport; import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService; import com.nanri.aiimage.modules.task.service.TaskResultItemService; +import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger; import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -779,6 +780,7 @@ public class QueryAsinTaskService { task.setStatus("RUNNING"); task.setFinishedAt(null); task.setErrorMessage(null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); return; } task.setStatus(failedCount > 0 ? "FAILED" : "SUCCESS"); @@ -791,8 +793,10 @@ public class QueryAsinTaskService { } } task.setErrorMessage(String.join("; ", errors)); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); } else { task.setErrorMessage(null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlTaskService.java index ec5b00472..a9528dfa8 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlTaskService.java @@ -1430,6 +1430,7 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline 0 ? "FAILED" : "SUCCESS"); @@ -1442,8 +1443,10 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline 0 && fail == 0) { task.setStatus("SUCCESS"); task.setErrorMessage(null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); task.setFinishedAt(now()); } else if (ok > 0) { // 部分店铺失败也必须是 FAILED(2026-09-30 修:此前标 SUCCESS 只把原因挂在 @@ -992,10 +996,12 @@ public class ShopMatchTaskService extends AbstractShopPayloadTaskPipeline 0 ? "FAILED" : "SUCCESS"); @@ -811,8 +813,10 @@ public class WithdrawTaskService { } } task.setErrorMessage(String.join("; ", errors)); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); } else { task.setErrorMessage(null); + task.setFailureCategory(TaskFailureLedger.categoryOf(task.getErrorMessage())); } } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskServiceTest.java index 508574f81..548a28aad 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskServiceTest.java @@ -185,6 +185,10 @@ class ProductRiskTaskServiceTest { void allShopsSucceededStaysSuccess() { long taskId = 29596L; FileTaskEntity task = runningTask(taskId); + // 陈旧列(B82-01 的另一半):这一行上一次被判过 DELIVERY,本轮清空了 error_message。 + // 实体式写面接 ledger 之后必须把列一起清掉——留着旧列,读侧就会在一行"成功"任务上 + // 读到一个已经不属于它的判决(护栏第五格场景④说的正是这个背离)。 + task.setFailureCategory("DELIVERY"); FileResultEntity okResult = shopResult(92031L, taskId, "张三", 1, null); okResult.setResultFilename("张三.zip"); okResult.setResultFileUrl("oss/product-risk/zhang.zip"); @@ -205,6 +209,7 @@ class ProductRiskTaskServiceTest { assertEquals("SUCCESS", task.getStatus()); assertNull(task.getErrorMessage()); + assertNull(task.getFailureCategory(), "清错误必须同时清分类列:陈旧列不许判死这一单"); assertNotNull(task.getFinishedAt()); } @@ -247,6 +252,51 @@ class ProductRiskTaskServiceTest { verify(lock).close(); } + /** + * B82-01 第三批的行为半边:汇总族任务把店铺级失败原因拼进任务级 {@code error_message}, + * 现网那 9 条「文案命中 markers 而列空」就是这个形状(跟价那一条是「会话失效且重新登录失败」)。 + * 名单内实体式写面接 ledger 之后,同一笔 {@code updateById} 必须把分类一起带走—— + * 护栏第五格只钉「下一行写了配对语句」(源码形状),本格钉「值真的落在交给 mapper 的那个实体上」, + * 而列会真进库由 {@code TaskFailureCategoryMigrationV186Test} 的 ALWAYS 钉负责。 + */ + @Test + void reconcileRecordsFailureCategoryTogetherWithMessage() { + long taskId = 29602L; + long userId = 672L; + FileResultEntity candidate = shopResult(93011L, taskId, SHOP_KEY, null, null); + candidate.setUserId(userId); + + FileTaskEntity task = runningTask(taskId); + task.setUserId(userId); + + FileResultEntity okResult = shopResult(93012L, taskId, "张三", 1, null); + okResult.setResultFilename("张三.zip"); + okResult.setResultFileUrl("oss/product-risk/zhang.zip"); + FileResultEntity failedResult = shopResult(93013L, taskId, "李四", 0, "德国: 会话失效且重新登录失败"); + failedResult.setResultFilename("李四.zip"); + failedResult.setResultFileUrl("oss/product-risk/li.zip"); + + TaskDistributedLockService.LockHandle lock = mock(TaskDistributedLockService.LockHandle.class); + when(ziniaoShopSwitchService.normalizeShopName(SHOP_KEY)).thenReturn(SHOP_KEY); + when(fileResultMapper.selectList(any())).thenReturn(List.of(candidate), List.of(okResult, failedResult)); + when(productRiskTaskCacheService.getTaskCacheBatch(List.of(taskId))).thenReturn(Map.of(taskId, task)); + when(taskDistributedLockService.acquire(MODULE_TYPE, taskId)).thenReturn(lock); + when(fileResultMapper.selectById(93011L)).thenReturn(candidate); + when(transactionManager.getTransaction(any())).thenReturn(new SimpleTransactionStatus()); + + service.deletePendingShopResult(userId, SHOP_KEY); + + ArgumentCaptor persisted = ArgumentCaptor.forClass(FileTaskEntity.class); + verify(fileTaskMapper).updateById(persisted.capture()); + FileTaskEntity written = persisted.getValue(); + assertEquals("FAILED", written.getStatus()); + assertTrue(written.getErrorMessage().contains("会话失效且重新登录失败"), + "店铺级原因要进任务文案,实际=" + written.getErrorMessage()); + assertEquals("CREDENTIAL", written.getFailureCategory(), + "文案命中 CREDENTIAL 族时列必须同笔落下(列空=读侧只能再靠中文子串)"); + verify(lock).close(); + } + /** * 审计留痕(2026-10-19 取证):「商品列表筛选」只走本地队列、不建单落库,出过 * 选成在售白跑 7 小时、事后无从查证的任务。客户端收尾回传带上 listingFilter/warning 后, diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskFailureCategoryGuardrailTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskFailureCategoryGuardrailTest.java index 1aa11c104..780cb6f82 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskFailureCategoryGuardrailTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskFailureCategoryGuardrailTest.java @@ -43,15 +43,28 @@ class TaskFailureCategoryGuardrailTest { /** 现网在册写点的下限:低于这个数说明扫描面或写法变了,而不是"违规被修完了"。 */ private static final int MIN_WRITE_SITES = 20; - /** 实体式写面的接线名单(第二批):只有列在这里的文件受 {@code 已接线的实体式任务写点...} 那格管。 */ + /** + * 实体式写面的接线名单(第二批四面+第三批七面,B82-01)。 + * + *

第三批进来的七面是现网 9 条「文案命中 markers 而列空」样本所属的那两族之外的全部 + * 终态实体式写面:风险/店铺匹配/查ASIN/提现/巡删(都是「汇总行状态 → 任务终态」那一族) + * + 店铺采集/巡删品牌(各有一处把「结果文件生成失败」直接写进任务行的 DELIVERY 族)。 + */ private static final List ENTITY_FACE_FILES = List.of( "AppearancePatentResultJobSupport.java", "SimilarAsinTaskService.java", "CollectDataService.java", - "PriceTrackTaskService.java"); + "PriceTrackTaskService.java", + "ProductRiskTaskService.java", + "ShopMatchTaskService.java", + "QueryAsinTaskService.java", + "WithdrawTaskService.java", + "PatrolDeleteTaskService.java", + "ShopDataCrawlTaskService.java", + "DeleteBrandRunService.java"); - /** 名单内在册写点数(AP 4 +相似ASIN 4 +采集 1 +跟价 6);低于它=写点被挪走或改了写法。 */ - private static final int ENTITY_FACE_MIN_WRITE_SITES = 15; + /** 名单内在册写点数(第二批 15 +第三批 32:风险 8/店铺匹配 5/查ASIN 3/提现 3/巡删 3/店铺采集 4/巡删品牌 6)。 */ + private static final int ENTITY_FACE_MIN_WRITE_SITES = 47; /** * {@code .updateById(} 写法总量的在册棘轮(B82-01 收口时的换算值:改前 173,本笔把 12 处 @@ -98,16 +111,17 @@ class TaskFailureCategoryGuardrailTest { } /** - * 实体式写面({@code task.setErrorMessage(...)} + {@code updateById})第二批接线。 + * 实体式写面({@code task.setErrorMessage(...)} + {@code updateById})的接线名单。 * - *

这四面写出的正是判死/重试真正消费的那些文案(DELIVERY/CREDENTIAL/BALANCE 家族: + *

这十一面写出的正是判死/重试真正消费的那些文案(DELIVERY/CREDENTIAL/BALANCE 家族: * 结果文件多次生成失败、跟价「会话失效且重新登录失败」、LLM 上游欠费)。它们不走 wrapper, * 上面那格扫不到;漏写列的后果不是崩,而是读侧对这一行 * 永远退回中文子串——加了一列却没买到任何免疫力,这正是 B51 的病灶形状。 * - *

名单之外(其它实体的 {@code setErrorMessage}、以及尚未接线的 {@code FileTaskEntity} 写面, - * 如风险/店铺匹配/查ASIN/提现/巡删五面的同类终态写点)本格不管:按面分批收是 - * {@code docs/REFACTOR_PLAN.md} §5 登记的口径,Contract 阶段前逐批加进来。 + *

名单的来历:第二批({@code eeff73d3})只收了四面,第三批(本笔)收了现网 9 条 + * 「文案命中 markers 而列空」样本所指向的另外七面。名单仍不是全集——名单之外 + * 新出现的 {@code FileTaskEntity} 实体式终态写点本格不管,按面逐批评判再登记; + * 收口的判据不是"扫到零违规",而是"每一处写文案的行旁边都写着同一句文案的分类"。 */ @Test void 已接线的实体式任务写点必须同笔派生写列() {