feat(phase-2): 无侵权行同步服务与出表成功点挂钩——覆盖式落表/公司归属读不出即跳过/失败只留日志不阻断

This commit is contained in:
2026-11-10 01:49:35 +08:00
parent 434e4bf037
commit 0512359b21
8 changed files with 607 additions and 14 deletions
@@ -0,0 +1,257 @@
package com.nanri.aiimage.modules.appearancepatent.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.appearancepatent.mapper.AppearancePatentCleanItemMapper;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentResultRowDto;
import com.nanri.aiimage.modules.appearancepatent.model.entity.CleanItemEntity;
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentResultRowReader;
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentRowNormalizer;
import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper;
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.service.TransientPayloadStorageService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* 出表成功点把「结论=无侵权」行按 result_id 覆盖式落后管新表(v1.3 R1,
* {@code biz_appearance_patent_clean_item},V189)。
*
* <p><b>触发点(蓝图 §3.3)=出表成功(结果文件已上传 OSS、result_file_url 回填)</b>,
* 三条出表路径全部覆盖:①异步出表作业成功(handler.process true 返回,经宿主
* {@code AppearancePatentTaskService#syncFromResult(Long, Long)} 进来);②失败兜底出表
* (handler.fallbackAssembleOnFailure 产出可下载部分结果,同上);③同步装配分支
* ({@code AppearancePatentResultJobSupport#finalizeTask} 内联成功,直调本服务)。
* 调用时机必须在 worker 的 {@code cleanupAfterSuccess} <b>之前</b>——分片载荷
* ({@code biz_task_chunk.payload_json})是本服务唯一行数据源,清理一过就再也读不回。
*
* <p><b>过滤口径</b>:conclusion 与 {@code AppearancePatentLlmClient.NO_INFRINGEMENT}
* 常量精确相等(字符串全等,不模糊、不 trim 变体;严格口径=用户拍板 ①)。
* 常量单一来源在 LlmClient,本类反射读取,不另抄字面量(黄金测试
* {@code AppearancePatentChunkRowContractTest} 钉字段名与取值)。
*
* <p><b>失败语义(AC-3/R5)</b>:入口吞掉一切异常只留日志,绝不反写任务/结果/作业——
* 出表链不因同步失败改变任何终态。
*
* <p><b>幂等(AC-2)</b>:按 result_id delete-then-insert 覆盖式重写(同
* {@code ShopDataCrawlItemStoreService} 模式),批量插入分批 ≤500/批;
* 事务收口在删除+插入两步,中途失败不留半批。
*/
@Slf4j
@Service
public class AppearancePatentCleanSyncService {
/** 分片翻页与插入分批大小,与出表读链的 chunk 页大小同口径。 */
private static final int PAGE_OR_BATCH_SIZE = 500;
private final AppearancePatentCleanItemMapper cleanItemMapper;
private final TaskChunkMapper taskChunkMapper;
private final AdminUserMapper adminUserMapper;
private final AppearancePatentResultRowReader rowReader;
private final TransactionTemplate transactionTemplate;
/**
* 判定常量单一来源={@code AppearancePatentLlmClient.NO_INFRINGEMENT}(蓝图 §2.2:
* 同步侧引用常量,禁止另抄字面量)。该字段是 private,反射读取;字段名与取值由
* Phase 0 黄金测试钉住,重命名会先红在黄金测试。读不到 ⇒ 返回 null,同步逐次
* 留 error 日志后停摆,出表链不受影响(AC-3)。
*/
private static final String CLEAN_CONCLUSION = loadNoInfringementConclusion();
public AppearancePatentCleanSyncService(AppearancePatentCleanItemMapper cleanItemMapper,
TaskChunkMapper taskChunkMapper,
AdminUserMapper adminUserMapper,
ObjectMapper objectMapper,
TransientPayloadStorageService transientPayloadStorageService,
PlatformTransactionManager transactionManager) {
this.cleanItemMapper = cleanItemMapper;
this.taskChunkMapper = taskChunkMapper;
this.adminUserMapper = adminUserMapper;
// 行读取只走 readChunkRows(解析载荷回调传 null,读取链不触达);归一与出表同一出处
this.rowReader = new AppearancePatentResultRowReader(
AppearancePatentTaskService.MODULE_TYPE, objectMapper, transientPayloadStorageService,
taskChunkMapper, AppearancePatentRowNormalizer::normalize, task -> null);
this.transactionTemplate = new TransactionTemplate(transactionManager);
}
/**
* 出表成功点入口。吞掉一切异常只留日志,绝不反写任务/结果/作业(AC-3)。
*/
public void syncFromResult(FileTaskEntity task, FileResultEntity result) {
try {
syncGuarded(task, result);
} catch (Exception ex) {
log.warn("[appearance-patent] clean-item sync failed (delivery state untouched) taskId={} resultId={} err={}",
task == null ? null : task.getId(), result == null ? null : result.getId(),
ex.getMessage(), ex);
}
}
private void syncGuarded(FileTaskEntity task, FileResultEntity result) {
if (task == null || task.getId() == null || result == null || result.getId() == null) {
return;
}
if (result.getResultFileUrl() == null || result.getResultFileUrl().isBlank()) {
// 出表未成功(url 未回填):不写任何行(AC-2 后半)
log.info("[appearance-patent] clean-item sync skipped: result file not delivered taskId={} resultId={}",
task.getId(), result.getId());
return;
}
if (CLEAN_CONCLUSION == null) {
// 判定口径失联:宁停摆也不猜值(黄金测试会先红)
log.error("[appearance-patent] clean-item sync disabled: NO_INFRINGEMENT constant unreadable"
+ " from AppearancePatentLlmClient taskId={} resultId={}", task.getId(), result.getId());
return;
}
Long companyId = resolveOwnerCompanyId(task);
if (companyId == null) {
return;
}
Map<String, AppearancePatentResultRowDto> payloadRows = loadChunkRows(task.getId());
if (payloadRows.isEmpty()) {
// 分片已清理或全部不可读(典型:已交付作业被事件重投):绝不清空已同步行
log.info("[appearance-patent] clean-item sync skipped: no readable chunk rows taskId={} resultId={}",
task.getId(), result.getId());
return;
}
List<CleanItemEntity> rows = extractCleanRows(task, result, companyId, payloadRows);
int deleted = replaceRows(result.getId(), rows);
log.info("[appearance-patent] clean-item synced taskId={} resultId={} payloadRows={} cleanRows={} deleted={} companyId={}",
task.getId(), result.getId(), payloadRows.size(), rows.size(), deleted, companyId);
}
/**
* 归属解析:任务 owner 用户 → {@code users.company_id}(物化列,蓝图 §3.1)。
* 读不出 ⇒ 跳过本任务并留日志,<b>不回填默认公司</b>(铁律 30:读不出≠没有,AC-1)。
*/
private Long resolveOwnerCompanyId(FileTaskEntity task) {
Long userId = task.getUserId();
if (userId == null) {
log.warn("[appearance-patent] clean-item sync skipped: task owner unreadable (no default backfill)"
+ " taskId={}", task.getId());
return null;
}
AdminUserEntity owner = adminUserMapper.selectById(userId);
Long companyId = owner == null ? null : owner.getCompanyId();
if (companyId == null || companyId <= 0) {
log.warn("[appearance-patent] clean-item sync skipped: owner company unreadable (no default backfill)"
+ " taskId={} userId={}", task.getId(), userId);
return null;
}
return companyId;
}
/**
* 读取 chunk 载荷全量行(唯一行数据源)。分片按 id 升序翻页(页大小与出表读链同口径),
* 逐片经 {@link AppearancePatentResultRowReader#readChunkRows} 解载荷;
* 片间同键后到覆盖先到=与出表按键读取同一语义。
*/
private Map<String, AppearancePatentResultRowDto> loadChunkRows(Long taskId) {
Map<String, AppearancePatentResultRowDto> merged = new LinkedHashMap<>();
Long lastChunkId = null;
while (true) {
LambdaQueryWrapper<TaskChunkEntity> query = new LambdaQueryWrapper<TaskChunkEntity>()
.eq(TaskChunkEntity::getTaskId, taskId)
.eq(TaskChunkEntity::getModuleType, AppearancePatentTaskService.MODULE_TYPE)
.orderByAsc(TaskChunkEntity::getId)
.last("LIMIT " + PAGE_OR_BATCH_SIZE);
if (lastChunkId != null) {
query.gt(TaskChunkEntity::getId, lastChunkId);
}
List<TaskChunkEntity> page = taskChunkMapper.selectList(query);
if (page == null || page.isEmpty()) {
break;
}
for (TaskChunkEntity chunk : page) {
merged.putAll(rowReader.readChunkRows(chunk));
}
TaskChunkEntity tail = page.getLast();
lastChunkId = tail == null ? null : tail.getId();
if (lastChunkId == null || page.size() < PAGE_OR_BATCH_SIZE) {
break;
}
}
return merged;
}
/**
* 严格口径过滤:conclusion 与常量精确相等(字符串全等,不模糊、不 trim 变体)。
* {@code row_no} 按 payload 全行序号计(含未入选行):重同步时序号稳定,
* 序号缺口即可审计出被过滤的行。
*/
private List<CleanItemEntity> extractCleanRows(FileTaskEntity task, FileResultEntity result,
Long companyId, Map<String, AppearancePatentResultRowDto> payloadRows) {
List<CleanItemEntity> rows = new ArrayList<>();
int rowNo = 0;
for (AppearancePatentResultRowDto row : payloadRows.values()) {
if (CLEAN_CONCLUSION.equals(row.getConclusion())) {
rows.add(toEntity(task, result, companyId, rowNo, row));
}
rowNo++;
}
return rows;
}
private CleanItemEntity toEntity(FileTaskEntity task, FileResultEntity result, Long companyId,
int rowNo, AppearancePatentResultRowDto row) {
CleanItemEntity entity = new CleanItemEntity();
entity.setResultId(result.getId());
entity.setTaskId(task.getId());
entity.setUserId(task.getUserId());
entity.setCompanyId(companyId);
entity.setRowNo(rowNo);
// AC-1「与 payload 一致」:值原样落列,不 trim、不变换
entity.setAsin(row.getAsin());
entity.setCountry(row.getCountry());
entity.setSku(row.getSku());
entity.setBrand(row.getBrand());
entity.setPrice(row.getPrice());
entity.setTitle(row.getTitle());
entity.setImageUrl(row.getUrl());
// item_url:chunk 载荷 23 键契约无该键(Phase 0 黄金测试钉定、V189 头注释同口径)——
// 按「payload 有才落」执行,保持 null 不伪造。
entity.setConclusion(row.getConclusion());
entity.setTitleReason(row.getTitleReason());
entity.setAppearanceReason(row.getAppearanceReason());
entity.setPatentReason(row.getPatentReason());
entity.setSourceFilename(row.getSourceFilename());
// synced_at 不写:列有 DB 默认值 CURRENT_TIMESTAMP(mapper XML 同一口径)
return entity;
}
/** 按 result_id 覆盖式重写:删除+分批插入收在同一事务(AC-2,中途失败不留半批)。 */
private int replaceRows(Long resultId, List<CleanItemEntity> rows) {
Integer deleted = transactionTemplate.execute(status -> {
int removed = cleanItemMapper.deleteByResultId(resultId);
for (int from = 0; from < rows.size(); from += PAGE_OR_BATCH_SIZE) {
cleanItemMapper.insertBatch(rows.subList(from, Math.min(from + PAGE_OR_BATCH_SIZE, rows.size())));
}
return removed;
});
return deleted == null ? 0 : deleted;
}
private static String loadNoInfringementConclusion() {
try {
Class<?> client = Class.forName(
"com.nanri.aiimage.modules.appearancepatent.client.AppearancePatentLlmClient");
Field field = client.getDeclaredField("NO_INFRINGEMENT");
field.setAccessible(true);
return (String) field.get(null);
} catch (ReflectiveOperationException ex) {
return null;
}
}
}
@@ -9,6 +9,12 @@ import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
* process 返回 Service 的 boolean(false=停放等待下一轮分片回传触发;此时执行线程已退出、
* Worker 的执行期心跳已取消,停放租约由客户端心跳经 AppearancePatentTaskHeartbeatSpi#onHeartbeat 续命);
* cleanup 委托 cleanupResultFileJob;支持异步 offload;owner scoped。
*
* <p>出表成功(process true / 兜底出表产出)即触发「无侵权」行同步(v1.3 R1,
* {@code AppearancePatentTaskService#syncFromResult} 委托
* {@code AppearancePatentCleanSyncService})。触发必须留在本方法内、即 Worker 的
* {@code cleanupAfterSuccess} 之前:分片载荷是同步的唯一行数据源,清理一过就读不回。
* 已交付作业被事件重投(分片已清)时同步侧自行判空跳过,不会清空已同步行。
*/
public class AppearancePatentResultFileJobHandler implements ResultFileJobHandler {
@@ -25,7 +31,13 @@ public class AppearancePatentResultFileJobHandler implements ResultFileJobHandle
@Override
public boolean process(TaskFileJobEntity job) {
return appearancePatentTaskService.processResultFileJob(job);
boolean delivered = appearancePatentTaskService.processResultFileJob(job);
if (delivered && job != null) {
// 出表成功点(result_file_url 已回填、分片仍在):同步「无侵权」行落后管新表。
// 同步侧自吞异常只留日志,不影响交付返回值(AC-3)。
appearancePatentTaskService.syncFromResult(job.getTaskId(), job.getResultId());
}
return delivered;
}
@Override
@@ -37,7 +49,12 @@ public class AppearancePatentResultFileJobHandler implements ResultFileJobHandle
public boolean fallbackAssembleOnFailure(TaskFileJobEntity job, String message) {
// 作业重试耗尽(含 WAIT_LLM 停放被 stuck 棘轮判死)时:用已有分片/结论尽力出
// 部分结果文件供下载,别让已跑完的检测一张表都不剩(线上任务 31302/31354)。
return appearancePatentTaskService.fallbackAssembleResultFile(job);
boolean produced = appearancePatentTaskService.fallbackAssembleResultFile(job);
if (produced && job != null) {
// 兜底出表也是出表成功:部分结果里的行同样进后管新表(同步失败只留日志)。
appearancePatentTaskService.syncFromResult(job.getTaskId(), job.getResultId());
}
return produced;
}
@Override
@@ -160,6 +160,10 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
@org.springframework.beans.factory.annotation.Autowired(required = false)
private com.nanri.aiimage.modules.usersecret.service.UserTaskGuardService taskGuard;
/** 出表成功点的「无侵权」行同步(v1.3 R1):字段注入避免改动手工构造器与 golden 用例(同 taskGuard);null=未启用(单测)。 */
@org.springframework.beans.factory.annotation.Autowired(required = false)
private AppearancePatentCleanSyncService cleanSyncService;
/**
* 参数顺序=迁移前 {@code @RequiredArgsConstructor} 的字段声明顺序,一字未动;
* 其中五枚(fileTaskMapper/fileResultMapper/taskDistributedLockService/
@@ -537,7 +541,8 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
llmBatchPipeline(), taskOwnership(),
this::acquireTaskLock, this::touchJavaSideTaskActivity,
AppearancePatentTaskService::resolveTaskExecutionStatus, this::firstNonBlank,
parsePipeline()::buildAggregateSourceFilenameLabel, parsePipeline()::buildAggregateScopeKey);
parsePipeline()::buildAggregateSourceFilenameLabel, parsePipeline()::buildAggregateScopeKey,
cleanSyncService);
}
/**
@@ -704,6 +709,27 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
return resultJobSupport().fallbackAssembleResultFile(job);
}
/**
* 出表成功后的「无侵权」行同步(v1.3 R1):异步出表作业成功与失败兜底出表两条路径由
* {@code AppearancePatentResultFileJobHandler} 调用;同步装配分支由
* {@code AppearancePatentResultJobSupport#finalizeTask} 直调同步服务。
* 委托 {@link AppearancePatentCleanSyncService#syncFromResult(FileTaskEntity, FileResultEntity)}——
* 同步任何异常只进日志,不反写任务/结果/作业(AC-3)。
*/
public void syncFromResult(Long taskId, Long resultId) {
if (cleanSyncService == null) {
return; // 单测未启用(同 taskGuard 口径)
}
FileTaskEntity task = taskId == null ? null : fileTaskMapper.selectById(taskId);
FileResultEntity result = resultId == null ? null : fileResultMapper.selectById(resultId);
if (task == null || result == null) {
log.warn("[appearance-patent] clean-item sync skipped: task/result row missing taskId={} resultId={}",
taskId, resultId);
return;
}
cleanSyncService.syncFromResult(task, result);
}
private boolean isResultSubmissionComplete(Long taskId) {
return resultJobSupport().isResultSubmissionComplete(taskId);
}
@@ -11,6 +11,7 @@ import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentPars
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.AppearancePatentCleanSyncService;
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;
@@ -78,6 +79,8 @@ public class AppearancePatentResultJobSupport {
private final FirstNonBlank firstNonBlank;
private final AggregateFilenameBuilder aggregateFilenameBuilder;
private final AggregateScopeKeyBuilder aggregateScopeKeyBuilder;
/** 出表成功点的「无侵权」行同步(v1.3 R1);null=未启用(单测,同 taskGuard 口径)。 */
private final AppearancePatentCleanSyncService cleanSyncService;
public interface LockAcquirer {
TaskDistributedLockService.LockHandle acquire(Long taskId, long waitMillis);
@@ -126,7 +129,8 @@ public class AppearancePatentResultJobSupport {
StatusResolver statusResolver,
FirstNonBlank firstNonBlank,
AggregateFilenameBuilder aggregateFilenameBuilder,
AggregateScopeKeyBuilder aggregateScopeKeyBuilder) {
AggregateScopeKeyBuilder aggregateScopeKeyBuilder,
AppearancePatentCleanSyncService cleanSyncService) {
this.moduleType = moduleType;
this.lockWaitMillis = lockWaitMillis;
this.properties = properties;
@@ -151,6 +155,7 @@ public class AppearancePatentResultJobSupport {
this.firstNonBlank = firstNonBlank;
this.aggregateFilenameBuilder = aggregateFilenameBuilder;
this.aggregateScopeKeyBuilder = aggregateScopeKeyBuilder;
this.cleanSyncService = cleanSyncService;
}
public void maybeRecoverTerminalFailedAssemble(Long taskId) {
@@ -213,6 +218,12 @@ public class AppearancePatentResultJobSupport {
log.warn("[appearance-patent] assemble result workbook failed taskId={} err={}", task.getId(), ex.getMessage());
finalError = firstNonBlank.pick(finalError, "Generate appearance patent result failed");
}
// 出表成功(result_file_url 已回填)→ 同步「无侵权」行落后管新表(v1.3 R1)。
// 同步侧自吞异常只留日志,绝不反写任务与结果(AC-3);组装抛异常时 url 未回填,
// 同步侧按「出表未成功」自行跳过。
if (cleanSyncService != null) {
cleanSyncService.syncFromResult(task, result);
}
}
}
// 抓取缺行是“部分数据缺口”,不是致命失败:只要已有可用结果记录、且错误里没有