refactor(phase-3): 3C 第三件公共件入底——writeJson 两处并档,RETHROW 下限按逐处记名调到 381

用户授权项①。CollectDataService 的两处序列化 catch 并进底座
AbstractFileTaskPipeline.writeJson(ObjectMapper, Object, String):
① 私有 writeJson(Object, String)(唯一调用点文案「采集结果序列化失败」逐字带到调用点);
② 建单 persistParsedTask 那段 try 包两次 writeValueAsString(文案「序列化任务信息失败」)。
两支的异常类型、文案、不带 cause 这三条线协议事实一字未动——建单 4 段与回传 15 段
golden 在非写模式下逐字节复现,就是这条等值的证明。

门禁判据动了一格且是被授权动的:RETHROW_FLOOR 383→381,两处出处逐一点名写在常量上方
(沿用 3B 的 386→385、3A 的 385→383 同一格式)。total 是上限、随两处离开树而 1004→1002,
不重抛/只 log/空体三格同批复跑一个未涨——判据一条没放宽。

第三处同形状(persistStats 的 try 包 15 行 put 加一次序列化)这笔没并:授权范围是两处,
再降一格要另行逐处记名。已在常量注释里点名留下这一格,别让下一个人以为本支已经并干净。

行数:本支棘轮 2123→2111(净减 12),对在册基线 2209 累计净减 98;基线未改、--write 未跑。

门禁:定向 328 例/0 红/2 skipped;后端全量 4533 例/0 红/14 skipped/BUILD SUCCESS
(真实 rc=0)——4533 比上一读数 +5 全是另一路未提交的 AppearancePatentLlmClientTest
(9→14 枚 @Test),本笔未新增任何用例方法。ops readability 棘轮 8 passed/1 failed,
唯一 offender 仍是它家未提交的 AppearancePatentLlmClient.java 1419→1465,本笔一字未碰、
不代收、不回写基线;ruff All checks passed。真机启动验收本格仍欠。
This commit is contained in:
2026-10-19 16:12:41 +08:00
parent e1bc19d331
commit 5229584a29
2 changed files with 30 additions and 32 deletions
@@ -399,28 +399,24 @@ public class CollectDataService extends AbstractFileTaskPipeline<CollectDataResu
sources.size());
task.setSuccessFileCount(0);
task.setFailedFileCount(0);
try {
Map<String, Object> requestPayload = new LinkedHashMap<>();
requestPayload.put("userId", request.getUserId());
requestPayload.put("taskType", taskType);
requestPayload.put("filters", filters);
requestPayload.put("files", sources);
task.setRequestJson(objectMapper.writeValueAsString(requestPayload));
Map<String, Object> initialStats = new LinkedHashMap<>();
initialStats.put("totalRows", parsedRows.size());
initialStats.put("receivedRows", 0);
initialStats.put("processedRows", 0);
initialStats.put("currentChunkRows", 0);
initialStats.put("dedupeFilteredCount", 0);
initialStats.put("invalidFilteredCount", 0);
initialStats.put("brandRejectedCount", 0);
initialStats.put("brandQueryFailedCount", 0);
initialStats.put("finalRowCount", 0);
initialStats.put("summaries", List.of());
task.setResultJson(objectMapper.writeValueAsString(initialStats));
} catch (Exception ex) {
throw new BusinessException("序列化任务信息失败");
}
Map<String, Object> requestPayload = new LinkedHashMap<>();
requestPayload.put("userId", request.getUserId());
requestPayload.put("taskType", taskType);
requestPayload.put("filters", filters);
requestPayload.put("files", sources);
task.setRequestJson(writeJson(objectMapper, requestPayload, "序列化任务信息失败"));
Map<String, Object> initialStats = new LinkedHashMap<>();
initialStats.put("totalRows", parsedRows.size());
initialStats.put("receivedRows", 0);
initialStats.put("processedRows", 0);
initialStats.put("currentChunkRows", 0);
initialStats.put("dedupeFilteredCount", 0);
initialStats.put("invalidFilteredCount", 0);
initialStats.put("brandRejectedCount", 0);
initialStats.put("brandQueryFailedCount", 0);
initialStats.put("finalRowCount", 0);
initialStats.put("summaries", List.of());
task.setResultJson(writeJson(objectMapper, initialStats, "序列化任务信息失败"));
insertTask(task);
int rowIndex = 0;
@@ -906,7 +902,7 @@ public class CollectDataService extends AbstractFileTaskPipeline<CollectDataResu
stats.finalRowCount += upsertCounts.newlyInserted();
}
String payloadJson = writeJson(rows, "采集结果序列化失败");
String payloadJson = writeJson(objectMapper, rows, "采集结果序列化失败");
String storedPayload = transientPayloadStorageService.storeChunkPayloadVersioned(
MODULE_TYPE, taskId, scopeHash, chunkIndex, payloadJson);
requireRustfsPayload(storedPayload, "采集结果分片必须写入 RustFS");
@@ -1430,14 +1426,6 @@ public class CollectDataService extends AbstractFileTaskPipeline<CollectDataResu
}
}
private String writeJson(Object value, String message) {
try {
return objectMapper.writeValueAsString(value);
} catch (Exception ex) {
throw new BusinessException(message);
}
}
private String normalizeAsin(String value) {
return normalize(value).toUpperCase(Locale.ROOT);
}