fix(外观专利): 完成标记只打在真正落库的行上

网关少回一行、或回来的 rowToken 在分片里匹配不到时,整批结果落库不完整,
但调用方仍把全部发送行标成已检测:没落库的那行带着"已检测"的空壳 24 小时内
不再补检,用户扣了次数却在结果里永久没有结论。合并写入改为回报真正写进去的
行键,只对这些行打完成标记,其余撤销交下一轮重发(受轮次上限约束)。
This commit is contained in:
2026-09-28 03:09:49 +08:00
parent f8e642588d
commit f4f6e414f0
3 changed files with 82 additions and 32 deletions
@@ -79,6 +79,9 @@ class AppearancePatentRowMarkTimingTest {
private static final String RESOLVED_ROWS =
"[{\"rowToken\":\"r1\",\"asin\":\"B0A0000001\",\"title\":\"RUNNING SHOE\",\"url\":\"http://img/1.jpg\",\"groupKey\":\"g1\",\"titleRisk\":\"无侵权\",\"appearanceRisk\":\"无侵权\",\"conclusion\":\"无侵权\"},"
+ "{\"rowToken\":\"r2\",\"asin\":\"B0A0000002\",\"title\":\"COTTON BAG\",\"url\":\"http://img/2.jpg\",\"groupKey\":\"g2\",\"titleRisk\":\"侵权\",\"appearanceRisk\":\"侵权\",\"conclusion\":\"侵权\"}]";
/** 网关的真实故障形态之一:发 2 行只回 1 行。 */
private static final String PARTIAL_RESOLVED_ROWS =
"[{\"rowToken\":\"r1\",\"asin\":\"B0A0000001\",\"title\":\"RUNNING SHOE\",\"url\":\"http://img/1.jpg\",\"groupKey\":\"g1\",\"titleRisk\":\"无侵权\",\"appearanceRisk\":\"无侵权\",\"conclusion\":\"无侵权\"}]";
@Mock private LocalFileStorageService localFileStorageService;
@Mock private OssStorageService ossStorageService;
@@ -211,6 +214,37 @@ class AppearancePatentRowMarkTimingTest {
verify(taskCacheService).releaseRowInspection(TASK_ID, List.of("r1", "r2"));
}
/**
* 发 2 行只回 1 行:落库成功的那行算完成,没回来的那行必须撤销交下一轮重发。
*
* <p>此前整批一起打完成标记,少回的行就带着"已检测"的空壳永久消失——
* 次数扣了、Excel 里那一行没有结论,正是"扣次数没出结果"的成因之一。
*/
@Test
void rowsMissingFromLlmAnswerStayRetryable() throws Exception {
when(taskCacheService.beginRowInspection(eq(TASK_ID), anyString())).thenReturn(true);
when(llmClient.inspectRows(any(), any(), any())).thenReturn(rows(PARTIAL_RESOLVED_ROWS));
stubMergeWrite(1);
submit();
verify(taskCacheService).completeRowInspection(TASK_ID, List.of("r1"));
verify(taskCacheService).releaseRowInspection(TASK_ID, List.of("r2"));
}
/** 回来的行一个都落不进分片(rowToken 被网关改写):整批都不能算完成。 */
@Test
void rowsThatMatchNoChunkRowStayRetryable() throws Exception {
when(taskCacheService.beginRowInspection(eq(TASK_ID), anyString())).thenReturn(true);
when(llmClient.inspectRows(any(), any(), any())).thenReturn(rows(
"[{\"rowToken\":\"r9\",\"asin\":\"B0A0000009\",\"title\":\"UNKNOWN\",\"url\":\"http://img/9.jpg\"}]"));
submit();
verify(taskCacheService, never()).completeRowInspection(anyLong(), any());
verify(taskCacheService).releaseRowInspection(TASK_ID, List.of("r1", "r2"));
}
/** 发送前续一次处理中标记,避免一批跑得比 TTL 长时被并发入口抢走。 */
@Test
void inFlightMarkIsRenewedRightBeforeSending() throws Exception {