diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java index 799393e77..0e09bca54 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java @@ -959,8 +959,8 @@ public class PublishTaskService extends AbstractFileTaskPipeline "PYTHON_QUEUE", request.getUserId(), deviceId, preparedFiles.size(), now); task.setSuccessFileCount(0); task.setFailedFileCount(failedFiles); - task.setRequestJson(writeJson(request, "序列化上架任务失败")); - task.setResultJson(writeJson(Map.of("ownerInstanceId", currentInstanceId()), + task.setRequestJson(writeJson(objectMapper, request, "序列化上架任务失败")); + task.setResultJson(writeJson(objectMapper, Map.of("ownerInstanceId", currentInstanceId()), "Failed to save publish task instance owner")); task.setErrorMessage(processableFiles > 0 ? null : "全部文件解析或店铺匹配失败"); task.setFinishedAt(processableFiles > 0 ? null : now); @@ -1352,7 +1352,7 @@ public class PublishTaskService extends AbstractFileTaskPipeline validateChunkTotal(scope == null ? null : scope.getChunkTotal(), chunkTotal); List rows = flattenRows(incoming); - String payloadJson = writeJson(rows, "序列化上架结果分片失败"); + String payloadJson = writeJson(objectMapper, rows, "序列化上架结果分片失败"); String payloadHash = DigestUtil.sha256Hex(payloadJson); TaskChunkEntity existing = findResultChunk(taskId, scopeHash, chunkIndex); String storedPayload = null; @@ -1622,7 +1622,7 @@ public class PublishTaskService extends AbstractFileTaskPipeline Map state = new LinkedHashMap<>(); state.put("phase", completed ? "COMPLETE" : "RECEIVING"); state.put("receivedRows", Math.max(0, receivedRowCount)); - return writeJson(state, "保存上架结果分片进度失败"); + return writeJson(objectMapper, state, "保存上架结果分片进度失败"); } private void updateReceivedProgress(Long taskId, PublishFileEntity file, int receivedRowCount) { @@ -1998,14 +1998,6 @@ public class PublishTaskService extends AbstractFileTaskPipeline return files.size() == 1 ? first : first + " 等 " + files.size() + " 个文件"; } - private String writeJson(Object value, String errorMessage) { - try { - return objectMapper.writeValueAsString(value); - } catch (Exception ex) { - throw new BusinessException(errorMessage); - } - } - private String formatTime(LocalDateTime value) { return value == null ? null : value.format(TIME_FORMATTER); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/pipeline/AbstractFileTaskPipeline.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/pipeline/AbstractFileTaskPipeline.java index 6ed05982c..aae50cd02 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/pipeline/AbstractFileTaskPipeline.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/pipeline/AbstractFileTaskPipeline.java @@ -45,13 +45,17 @@ import java.util.List; * 只有文案不同,是最干净的公共件。Phase 2 当时落不了——{@code config/CatchSilenceRatchetTest} * 的自述规则是「新增捕获块要么别加,要么同批减掉一处同形状」,而 Phase 2 禁止改七支 * ⇒ 减不掉只能不加(登记见蓝图 §5 Phase 2 那条);首迁这一笔删掉被迁支的本地同名件, - * 净增 ≤ 0 才成立。现成模板 {@code PublishTaskService} 的私有 - * {@code writeJson(Object, String)} 就是带文案参数的形状(认方法名不认行号;那一格 3D 未并档)。 + * 净增 ≤ 0 才成立。带文案参数的形状取自 {@code PublishTaskService} 那枚私有 + * {@code writeJson(Object, String)}(认方法名不认行号);那一格已于 2026-10-22 并档, + * 本件至此是七支唯一的序列化出口。 * ⚠ task 模块内部那三份逐字同名件({@code TaskProgressSnapshotService:186}/ * {@code TaskResultItemService:405}/{@code TaskResultPayloadService:113})本轮仍未归并: * 归并会把 RETHROW 那一格跌破下限(它是下限不是上限;首迁后落在 386,3B 并掉 ShopDataCrawl * 那份私有同名件后按「逐条点名改基线」调到 385,出处写在 {@code CatchSilenceRatchetTest}), - * 再往下降就属于「调整门禁判据」动作,与 Phase 0 那格「三格守卫」同批做,不在迁移笔里顺手干。 + * 再往下降就属于「调整门禁判据」动作,与 Phase 0 那格「三格守卫」同批做,不在迁移笔里顺手干。 + * ⚠ 那句「会跌破」的前提数在 2026-10-22 已变:当时 Publish 并档实测整树 + * rethrow=383/total=1000(复现办法见 {@code CatchSilenceRatchetTest} 常量上方), + * 所以下一支若只归并 task 那三份中的部分,可能压根不需要动判据——先复现再判,别照抄这句。 *
  • 跑批:服务端没有属于这七支的可沉件——机制早已收在 * {@link TaskFileJobService}(enqueue/claim/markSuccess/markFailed)+ * {@code TaskResultFileJobWorker}(取锁、重排、重试)+ @@ -319,8 +323,9 @@ public abstract class AbstractFileTaskPipeline { *

    七支建单与状态回写时都要把对象转成 JSON,失败形状逐字相同: * 抛 {@code BusinessException(<文案>)} 且不带 cause * (ShopMatch{@code :510-512} 的文案是「task 不存在」、{@code :1301-1303} 是「序列化任务数据失败」, - * PriceTrack{@code :571-573} 与 Publish 的私有 {@code writeJson} 同款;Publish 那一格 3D 迁移 - * 未并档——它要动 {@code RETHROW_FLOOR},属门禁判据动作、须逐处记名授权)。 + * PriceTrack{@code :571-573} 与 Publish 的私有 {@code writeJson} 同款;Publish 那一格已于 + * 2026-10-22 并档(当时判「未并」的理由是它要动 {@code RETHROW_FLOOR},属门禁判据动作、 + * 须逐处记名授权;实际并档后实测整树 rethrow 仍在上限内,那一格至今未被放宽)。 * 文案是各支自己的对外语义(其中「task 不存在」甚至是现网一句会说谎的文案——序列化失败跟任务存不存在 * 没关系,但 Python 侧按这句决定要不要重试,改它=改线协议),所以底座只收形状、文案由调用方给。 *