From 0512359b21fb7a31e43e516409f04a3598ca84d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Tue, 10 Nov 2026 01:49:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(phase-2):=20=E6=97=A0=E4=BE=B5=E6=9D=83?= =?UTF-8?q?=E8=A1=8C=E5=90=8C=E6=AD=A5=E6=9C=8D=E5=8A=A1=E4=B8=8E=E5=87=BA?= =?UTF-8?q?=E8=A1=A8=E6=88=90=E5=8A=9F=E7=82=B9=E6=8C=82=E9=92=A9=E2=80=94?= =?UTF-8?q?=E2=80=94=E8=A6=86=E7=9B=96=E5=BC=8F=E8=90=BD=E8=A1=A8/?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=BD=92=E5=B1=9E=E8=AF=BB=E4=B8=8D=E5=87=BA?= =?UTF-8?q?=E5=8D=B3=E8=B7=B3=E8=BF=87/=E5=A4=B1=E8=B4=A5=E5=8F=AA?= =?UTF-8?q?=E7=95=99=E6=97=A5=E5=BF=97=E4=B8=8D=E9=98=BB=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppearancePatentCleanSyncService.java | 257 ++++++++++++++++ .../AppearancePatentResultFileJobHandler.java | 21 +- .../service/AppearancePatentTaskService.java | 28 +- .../AppearancePatentResultJobSupport.java | 13 +- .../AppearancePatentCleanSyncTest.java | 288 +++++++++++++++++- ...AppearancePatentInterruptedResumeTest.java | 3 +- ...rancePatentRecheckProgressMessageTest.java | 3 +- ...sultFileJobHandlerMappingSnapshotTest.java | 8 +- 8 files changed, 607 insertions(+), 14 deletions(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentCleanSyncService.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentCleanSyncService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentCleanSyncService.java new file mode 100644 index 000000000..f1ace8cda --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentCleanSyncService.java @@ -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)。 + * + *

触发点(蓝图 §3.3)=出表成功(结果文件已上传 OSS、result_file_url 回填), + * 三条出表路径全部覆盖:①异步出表作业成功(handler.process true 返回,经宿主 + * {@code AppearancePatentTaskService#syncFromResult(Long, Long)} 进来);②失败兜底出表 + * (handler.fallbackAssembleOnFailure 产出可下载部分结果,同上);③同步装配分支 + * ({@code AppearancePatentResultJobSupport#finalizeTask} 内联成功,直调本服务)。 + * 调用时机必须在 worker 的 {@code cleanupAfterSuccess} 之前——分片载荷 + * ({@code biz_task_chunk.payload_json})是本服务唯一行数据源,清理一过就再也读不回。 + * + *

过滤口径:conclusion 与 {@code AppearancePatentLlmClient.NO_INFRINGEMENT} + * 常量精确相等(字符串全等,不模糊、不 trim 变体;严格口径=用户拍板 ①)。 + * 常量单一来源在 LlmClient,本类反射读取,不另抄字面量(黄金测试 + * {@code AppearancePatentChunkRowContractTest} 钉字段名与取值)。 + * + *

失败语义(AC-3/R5):入口吞掉一切异常只留日志,绝不反写任务/结果/作业—— + * 出表链不因同步失败改变任何终态。 + * + *

幂等(AC-2):按 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 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 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)。 + * 读不出 ⇒ 跳过本任务并留日志,不回填默认公司(铁律 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 loadChunkRows(Long taskId) { + Map merged = new LinkedHashMap<>(); + Long lastChunkId = null; + while (true) { + LambdaQueryWrapper query = new LambdaQueryWrapper() + .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 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 extractCleanRows(FileTaskEntity task, FileResultEntity result, + Long companyId, Map payloadRows) { + List 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 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; + } + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentResultFileJobHandler.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentResultFileJobHandler.java index 3035d34ed..b0edccc80 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentResultFileJobHandler.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentResultFileJobHandler.java @@ -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。 + * + *

出表成功(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 diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java index 52cbbacb0..17b41f69a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java @@ -160,6 +160,10 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipelinePending Phase 2 激活。Phase 0 预置的是接缝判据(接缝名是判据的一部分,Phase 2 微调命名 - * 必须同步改本文件并在蓝图 §5 登记);激活时除本清单外,再补真实对象的行为样本:

+ *

Phase 2 已激活。前 5 支是 Phase 0 预置的接缝判据(接缝名是判据的一部分, + * 改名必须同步改判据并在蓝图 §5 登记);后 8 支是激活时补的真实对象行为样本:

* * */ -@Disabled("Pending Phase 2: AC-1/AC-2/AC-3 外观专利无侵权行同步落表(激活时移除本注解)") class AppearancePatentCleanSyncTest { private static final Path MODULE = Path.of("").toAbsolutePath(); @@ -45,6 +72,8 @@ class AppearancePatentCleanSyncTest { private static final String TRIGGER_2_REL = "modules/appearancepatent/service/AppearancePatentResultFileJobHandler.java"; + // ===================== Phase 0 预置接缝判据(激活) ===================== + @Test void 同步服务类与入口接缝就位() throws Exception { Class service = Class.forName(SYNC_SERVICE_FQCN, @@ -101,6 +130,253 @@ class AppearancePatentCleanSyncTest { "不得把 company_id 回填成默认 1——owner 读不出 company_id 必须跳过并留日志(铁律 30,AC-1)"); } + // ===================== 激活时补的行为样本(AC-1/AC-2/AC-3) ===================== + + @Test + void 出表成功后按严格口径落表且归属任务owner公司() throws Exception { + AppearancePatentCleanItemMapper cleanItemMapper = mock(AppearancePatentCleanItemMapper.class); + TaskChunkMapper taskChunkMapper = mock(TaskChunkMapper.class); + AdminUserMapper adminUserMapper = mock(AdminUserMapper.class); + when(taskChunkMapper.selectList(any())).thenReturn(List.of(chunk(33001L))); + when(adminUserMapper.selectById(77L)).thenReturn(user(7L)); + ObjectMapper mapper = new ObjectMapper(); + // 行序即 row_no 序:clean(0)/clean(1)/待复核(2)/侵权(3)。字面量取值口径由黄金测试 + // AppearancePatentChunkRowContractTest#无侵权常量快照单一来源 钉在 LlmClient。 + String payloadJson = mapper.writeValueAsString(List.of( + row("t1", "B0CLEAN001", "无侵权"), + row("t2", "B0CLEAN002", "无侵权"), + row("t3", "B0RECHK01", "外观无侵权·商标待复核"), + row("t4", "B0BAD0001", "侵权"))); + AppearancePatentCleanSyncService service = service(cleanItemMapper, taskChunkMapper, adminUserMapper, payloadJson); + + service.syncFromResult(task(33001L, 77L), result(34819L, 33001L, "oss://result/x.xlsx")); + + verify(cleanItemMapper).deleteByResultId(34819L); + @SuppressWarnings("unchecked") + ArgumentCaptor> rows = ArgumentCaptor.forClass((Class) List.class); + verify(cleanItemMapper).insertBatch(rows.capture()); + assertEquals(2, rows.getValue().size(), "严格口径只应落 2 行:待复核与侵权行零落表(用户拍板 ①)"); + CleanItemEntity first = rows.getValue().get(0); + assertEquals(34819L, first.getResultId()); + assertEquals(33001L, first.getTaskId()); + assertEquals(77L, first.getUserId()); + assertEquals(7L, first.getCompanyId(), "company_id=任务 owner 用户的 users.company_id(物化列)"); + assertEquals(0, first.getRowNo()); + assertEquals("B0CLEAN001", first.getAsin()); + assertEquals("英国", first.getCountry()); + assertEquals("SKU-B0CLEAN001", first.getSku()); + assertEquals("Nike", first.getBrand()); + assertEquals("12.99", first.getPrice()); + assertEquals("Women Floral Dress Summer Casual", first.getTitle()); + assertEquals("https://img.example/B0CLEAN001.jpg", first.getImageUrl()); + assertNull(first.getItemUrl(), "payload 23 键契约无 itemUrl 键:V189 立列但可空,按「payload 有才落」不伪造"); + assertEquals("无侵权", first.getConclusion(), "结论存原值不转写"); + assertEquals("标题维度原因", first.getTitleReason()); + assertEquals("外观维度原因", first.getAppearanceReason()); + assertEquals("专利维度原因", first.getPatentReason()); + assertEquals("appearance_patent_33001.xlsx", first.getSourceFilename()); + assertEquals(1, rows.getValue().get(1).getRowNo(), "row_no 按 payload 全行序号计(含未入选行),序号缺口即可审计被过滤的行"); + } + + @Test + void owner读不出公司归属时跳过不回填默认公司() throws Exception { + AppearancePatentCleanItemMapper cleanItemMapper = mock(AppearancePatentCleanItemMapper.class); + TaskChunkMapper taskChunkMapper = mock(TaskChunkMapper.class); + AdminUserMapper adminUserMapper = mock(AdminUserMapper.class); + when(taskChunkMapper.selectList(any())).thenReturn(List.of(chunk(33001L))); + when(adminUserMapper.selectById(77L)).thenReturn(user(null)); + AppearancePatentCleanSyncService service = service(cleanItemMapper, taskChunkMapper, adminUserMapper, + new ObjectMapper().writeValueAsString(List.of(row("t1", "B0CLEAN001", "无侵权")))); + + service.syncFromResult(task(33001L, 77L), result(34819L, 33001L, "oss://result/x.xlsx")); + + verifyNoInteractions(cleanItemMapper); + } + + @Test + void 重新出表按resultId覆盖式重写零重复() throws Exception { + AppearancePatentCleanItemMapper cleanItemMapper = mock(AppearancePatentCleanItemMapper.class); + TaskChunkMapper taskChunkMapper = mock(TaskChunkMapper.class); + AdminUserMapper adminUserMapper = mock(AdminUserMapper.class); + when(taskChunkMapper.selectList(any())).thenReturn(List.of(chunk(33001L))); + when(adminUserMapper.selectById(77L)).thenReturn(user(7L)); + ObjectMapper mapper = new ObjectMapper(); + TransientPayloadStorageService storage = mock(TransientPayloadStorageService.class); + // 补检后首行结论翻成侵权:覆盖式重写后只剩 1 行(row_no=1),uk(result_id, row_no) 下零重复 + when(storage.resolvePayload(anyString(), anyString())) + .thenReturn(mapper.writeValueAsString(List.of( + row("t1", "B0CLEAN001", "无侵权"), + row("t2", "B0CLEAN002", "无侵权"))) + ) + .thenReturn(mapper.writeValueAsString(List.of( + row("t1", "B0CLEAN001", "侵权"), + row("t2", "B0CLEAN002", "无侵权"))) + ); + AppearancePatentCleanSyncService syncService = new AppearancePatentCleanSyncService( + cleanItemMapper, taskChunkMapper, adminUserMapper, mapper, storage, + mock(org.springframework.transaction.PlatformTransactionManager.class)); + + FileTaskEntity task = task(33001L, 77L); + FileResultEntity result = result(34819L, 33001L, "oss://result/x.xlsx"); + syncService.syncFromResult(task, result); + syncService.syncFromResult(task, result); + + InOrder order = inOrder(cleanItemMapper); + order.verify(cleanItemMapper, times(2)).deleteByResultId(34819L); + @SuppressWarnings("unchecked") + ArgumentCaptor> batches = ArgumentCaptor.forClass((Class) List.class); + verify(cleanItemMapper, times(2)).insertBatch(batches.capture()); + assertEquals(2, batches.getAllValues().get(0).size()); + assertEquals(1, batches.getAllValues().get(1).size(), "覆盖式重写:重出后只落仍满足严格口径的行"); + } + + @Test + void 出表失败url未回填不写任何行() throws Exception { + AppearancePatentCleanItemMapper cleanItemMapper = mock(AppearancePatentCleanItemMapper.class); + TaskChunkMapper taskChunkMapper = mock(TaskChunkMapper.class); + AdminUserMapper adminUserMapper = mock(AdminUserMapper.class); + AppearancePatentCleanSyncService service = service(cleanItemMapper, taskChunkMapper, adminUserMapper, + new ObjectMapper().writeValueAsString(List.of(row("t1", "B0CLEAN001", "无侵权")))); + + service.syncFromResult(task(33001L, 77L), result(34819L, 33001L, null)); + + verifyNoInteractions(cleanItemMapper); + verifyNoInteractions(taskChunkMapper); + } + + @Test + void 分片不可读时绝不清空已同步行() throws Exception { + AppearancePatentCleanItemMapper cleanItemMapper = mock(AppearancePatentCleanItemMapper.class); + TaskChunkMapper taskChunkMapper = mock(TaskChunkMapper.class); + AdminUserMapper adminUserMapper = mock(AdminUserMapper.class); + when(taskChunkMapper.selectList(any())).thenReturn(List.of()); + when(adminUserMapper.selectById(77L)).thenReturn(user(7L)); + AppearancePatentCleanSyncService service = service(cleanItemMapper, taskChunkMapper, adminUserMapper, "[]"); + + // 已交付作业被事件重投:分片已清理,此时删除=清空用户已同步的数据,必须跳过 + service.syncFromResult(task(33001L, 77L), result(34819L, 33001L, "oss://result/x.xlsx")); + + verifyNoInteractions(cleanItemMapper); + } + + @Test + void 同步异常只进日志不外抛不碰任务与结果() throws Exception { + AppearancePatentCleanItemMapper cleanItemMapper = mock(AppearancePatentCleanItemMapper.class); + TaskChunkMapper taskChunkMapper = mock(TaskChunkMapper.class); + AdminUserMapper adminUserMapper = mock(AdminUserMapper.class); + when(taskChunkMapper.selectList(any())).thenReturn(List.of(chunk(33001L))); + when(adminUserMapper.selectById(77L)).thenReturn(user(7L)); + when(cleanItemMapper.deleteByResultId(anyLong())).thenThrow(new RuntimeException("db down")); + AppearancePatentCleanSyncService service = service(cleanItemMapper, taskChunkMapper, adminUserMapper, + new ObjectMapper().writeValueAsString(List.of(row("t1", "B0CLEAN001", "无侵权")))); + + FileTaskEntity task = task(33001L, 77L); + FileResultEntity result = result(34819L, 33001L, "oss://result/x.xlsx"); + assertDoesNotThrow(() -> service.syncFromResult(task, result), + "同步失败必须吞掉只留日志(AC-3):出表链不因同步失败改变任何终态"); + assertEquals("SUCCESS", task.getStatus(), "任务终态不被改写"); + assertEquals("oss://result/x.xlsx", result.getResultFileUrl(), "结果文件地址不被改写"); + } + + @Test + void 异步出表作业成功后触发同步且停放不触发() { + AppearancePatentTaskService facade = mock(AppearancePatentTaskService.class); + AppearancePatentResultFileJobHandler handler = new AppearancePatentResultFileJobHandler(facade); + TaskFileJobEntity job = new TaskFileJobEntity(); + job.setTaskId(31769L); + job.setResultId(34819L); + + when(facade.processResultFileJob(job)).thenReturn(true); + handler.process(job); + verify(facade).syncFromResult(31769L, 34819L); + + when(facade.processResultFileJob(job)).thenReturn(false); + handler.process(job); + // 停放(等待分片/补检)不是出表成功,不触发同步 + verify(facade, times(1)).syncFromResult(anyLong(), anyLong()); + } + + @Test + void 失败兜底出表成功后触发同步() { + AppearancePatentTaskService facade = mock(AppearancePatentTaskService.class); + AppearancePatentResultFileJobHandler handler = new AppearancePatentResultFileJobHandler(facade); + TaskFileJobEntity job = new TaskFileJobEntity(); + job.setTaskId(31769L); + job.setResultId(34819L); + + when(facade.fallbackAssembleResultFile(job)).thenReturn(true); + handler.fallbackAssembleOnFailure(job, "重试耗尽"); + verify(facade).syncFromResult(31769L, 34819L); + + when(facade.fallbackAssembleResultFile(job)).thenReturn(false); + handler.fallbackAssembleOnFailure(job, "兜底也失败"); + verify(facade, times(1)).syncFromResult(anyLong(), anyLong()); + } + + // ===================== 夹具 ===================== + + private static AppearancePatentCleanSyncService service(AppearancePatentCleanItemMapper cleanItemMapper, + TaskChunkMapper taskChunkMapper, + AdminUserMapper adminUserMapper, + String payloadJson) { + TransientPayloadStorageService storage = mock(TransientPayloadStorageService.class); + when(storage.resolvePayload(anyString(), anyString())).thenReturn(payloadJson); + return new AppearancePatentCleanSyncService(cleanItemMapper, taskChunkMapper, adminUserMapper, + new ObjectMapper(), storage, mock(org.springframework.transaction.PlatformTransactionManager.class)); + } + + private static TaskChunkEntity chunk(long taskId) { + TaskChunkEntity chunk = new TaskChunkEntity(); + chunk.setTaskId(taskId); + chunk.setChunkIndex(0); + chunk.setPayloadJson("chunk-0.json"); + return chunk; + } + + private static AppearancePatentResultRowDto row(String rowToken, String asin, String conclusion) { + AppearancePatentResultRowDto row = new AppearancePatentResultRowDto(); + row.setRowToken(rowToken); + row.setId("2_1"); + row.setAsin(asin); + row.setCountry("英国"); + row.setSku("SKU-" + asin); + row.setBrand("Nike"); + row.setPrice("12.99"); + row.setUrl("https://img.example/" + asin + ".jpg"); + row.setTitle("Women Floral Dress Summer Casual"); + row.setConclusion(conclusion); + row.setTitleReason("标题维度原因"); + row.setAppearanceReason("外观维度原因"); + row.setPatentReason("专利维度原因"); + row.setSourceFilename("appearance_patent_33001.xlsx"); + return row; + } + + private static FileTaskEntity task(long taskId, Long userId) { + FileTaskEntity task = new FileTaskEntity(); + task.setId(taskId); + task.setModuleType("APPEARANCE_PATENT"); + task.setUserId(userId); + task.setStatus("SUCCESS"); + return task; + } + + private static FileResultEntity result(long resultId, long taskId, String fileUrl) { + FileResultEntity result = new FileResultEntity(); + result.setId(resultId); + result.setTaskId(taskId); + result.setModuleType("APPEARANCE_PATENT"); + result.setResultFileUrl(fileUrl); + return result; + } + + private static AdminUserEntity user(Long companyId) { + AdminUserEntity user = new AdminUserEntity(); + user.setId(77L); + user.setCompanyId(companyId); + return user; + } + private static Path findCleanItemMapperXml() throws IOException { Path resources = MODULE.resolve("src/main/resources/mapper"); if (!Files.exists(resources)) { diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentInterruptedResumeTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentInterruptedResumeTest.java index 1fb912a55..dc875134b 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentInterruptedResumeTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentInterruptedResumeTest.java @@ -102,7 +102,8 @@ class AppearancePatentInterruptedResumeTest { fileTaskMapper, fileResultMapper, taskScopeStateMapper, taskChunkMapper, taskCacheService, null, null, payloadSupport, null, null, deliverySupport, progressSupport, null, - null, null, null, null, null, null, null); + null, null, null, null, null, null, null, + null); } private static FileTaskEntity task(String status) { diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentRecheckProgressMessageTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentRecheckProgressMessageTest.java index 4864513b3..a5894f6ef 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentRecheckProgressMessageTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentRecheckProgressMessageTest.java @@ -56,7 +56,8 @@ class AppearancePatentRecheckProgressMessageTest { "APPEARANCE_PATENT", 0L, null, null, null, null, null, null, null, null, null, null, null, null, deliverySupport, progressSupport, null, - null, null, null, null, null, null, null); + null, null, null, null, null, null, null, + null); } private FileTaskEntity task() { diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/ResultFileJobHandlerMappingSnapshotTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/ResultFileJobHandlerMappingSnapshotTest.java index ac972f17d..27016d364 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/ResultFileJobHandlerMappingSnapshotTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/ResultFileJobHandlerMappingSnapshotTest.java @@ -118,8 +118,12 @@ class ResultFileJobHandlerMappingSnapshotTest { Method process = AppearancePatentResultFileJobHandler.class.getDeclaredMethod("process", TaskFileJobEntity.class); assertTrue(process.getReturnType() == boolean.class, "异步模块返回 boolean"); String source = handlerSource("AppearancePatentResultFileJobHandler"); - assertTrue(source.contains("return appearancePatentTaskService.processResultFileJob(job)"), - "原样透传 Service boolean"); + // v1.3(无侵权行同步)起成功分支追加 syncFromResult,返回值仍是 Service boolean 原样透传: + // 接缝判据随蓝图 §2.2 的 hook 计划同步改形(见蓝图 §5 变更记录),语义判据拆成两支。 + assertTrue(source.contains("boolean delivered = appearancePatentTaskService.processResultFileJob(job);"), + "透传 Service boolean(成功分支追加同步,返回值不变)"); + assertTrue(source.contains("return delivered;"), "process 原样透传 Service boolean,不翻转"); + assertTrue(source.contains("syncFromResult"), "出表成功点追加「无侵权」行同步(v1.3 R1,AC-3)"); assertTrue(source.contains("supportsAsyncOffload()") && source.contains("return true;"), "offload 标记为 true"); }