From 87a306458cc7af9349de9635e74255248f9ca411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Fri, 2 Oct 2026 10:35:17 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=B4=A7=E6=BA=90):=20=E5=93=81=E7=89=8C?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=83=A8=E5=88=86=E7=BB=93=E6=9E=9C=E6=96=87?= =?UTF-8?q?=E6=A1=88=E5=8F=AA=E5=86=99=E5=8F=AF=E8=A7=82=E6=B5=8B=E4=BA=8B?= =?UTF-8?q?=E5=AE=9E=EF=BC=8C=E4=B8=8D=E5=86=8D=E6=8C=87=E8=AE=A4=E7=8C=9C?= =?UTF-8?q?=E6=B5=8B=E7=9A=84=E6=95=85=E9=9A=9C=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 通知里那句「(品牌检测服务超时或被限流)」是本层代码推断出来的,真实原因 只有 BrandCheckClient 的 brand-check warn 日志知道(本轮实际是代理取不到 IP)。 把猜测写进用户通知,会把排查方向从「代理/账号余额」带到「品牌服务」上去。 新增 CollectDataPartialResultNoticeTest 3 例:驱动真 processResultFileJob, 断言文案含可核对的语义、不含「超时/限流」,且任务已被判失败时不推这条。 --- .../service/CollectDataService.java | 4 +- .../CollectDataPartialResultNoticeTest.java | 149 ++++++++++++++++++ 2 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/collectdata/service/CollectDataPartialResultNoticeTest.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataService.java index edc7d8694..1b8a8b26a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataService.java @@ -1156,10 +1156,12 @@ public class CollectDataService { } // 品牌查询失败的行不进结果、也不落无效品牌表(见上面 rejected/queryFailed 的区分), // 用户端因此完全没有出口:只在任务确实翻成成功时补一条通知。 + // 文案只写这一层观测得到的事实(未返回结果);真实原因(代理取不到 IP / 上游 503 / 被限流) + // 只有 BrandCheckClient 的 brand-check warn 日志知道,写进通知会把排查方向带偏。 if (updated > 0 && stats.brandQueryFailedCount > 0) { notificationDispatchService.pushPartialResult(task.getUserId(), task.getId(), MODULE_TYPE, task.getTaskNo(), stats.brandQueryFailedCount - + " 行商品的品牌检测未返回结果(品牌检测服务超时或被限流),这些行不计入结果条数," + + " 行商品的品牌检测未返回结果,这些行不计入结果条数," + "也没有被判定为无效品牌,可稍后单独重跑这些 ASIN"); } } finally { diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/collectdata/service/CollectDataPartialResultNoticeTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/collectdata/service/CollectDataPartialResultNoticeTest.java new file mode 100644 index 000000000..c32662e6a --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/collectdata/service/CollectDataPartialResultNoticeTest.java @@ -0,0 +1,149 @@ +package com.nanri.aiimage.modules.collectdata.service; + +import cn.hutool.core.io.FileUtil; +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.nanri.aiimage.modules.notification.service.NotificationDispatchService; +import com.nanri.aiimage.modules.task.mapper.FileResultMapper; +import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; +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.TaskFileJobEntity; +import com.nanri.aiimage.modules.file.service.oss.OssStorageService; +import org.apache.ibatis.builder.MapperBuilderAssistant; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.io.File; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * 「任务成功但有一部分行没跑出来」通知文案(2026-10-02)。 + * + *

背景:后台通知里这条写死了「品牌检测服务超时或被限流」,而 10-02 取证出的真实根因是品牌链 + * 上游的采集代理取不到 IP(余额不足)与 503 —— 代码在这个位置只观测到「品牌检测没返回结果」, + * 观测不到原因。写死一个猜测的原因会把排查方向从代理/上游带到自身服务上。 + * + *

锁定契约:文案只陈述可观测事实(缺失行数、不计入结果条数、未判无效、可重跑), + * 不指认代码没有依据的具体故障原因;真实原因留在 BrandCheckClient 的 warn 日志里 + * (brand-check 的 lastErr 字段),由运维按日志排查。 + */ +@ExtendWith(MockitoExtension.class) +class CollectDataPartialResultNoticeTest { + + @Mock private FileTaskMapper fileTaskMapper; + @Mock private FileResultMapper fileResultMapper; + @Mock private CollectDataExcelAssemblyService excelAssemblyService; + @Mock private OssStorageService ossStorageService; + @Mock private NotificationDispatchService notificationDispatchService; + + @Spy private ObjectMapper objectMapper = new ObjectMapper(); + + @InjectMocks private CollectDataService service; + + private static final long TASK_ID = 29991L; + + /** LambdaUpdateWrapper 需要实体的列缓存,纯单测里没有 Spring 容器要手工初始化。 */ + @BeforeAll + static void initTableInfo() { + MapperBuilderAssistant assistant = new MapperBuilderAssistant(new MybatisConfiguration(), ""); + TableInfoHelper.initTableInfo(assistant, FileTaskEntity.class); + TableInfoHelper.initTableInfo(assistant, FileResultEntity.class); + } + + @AfterEach + void cleanWorkDir() { + FileUtil.del(new File(System.getProperty("java.io.tmpdir"), "collect-data-result/" + TASK_ID)); + } + + private FileTaskEntity taskWithQueryFailedRows(int queryFailedRows) { + FileTaskEntity task = new FileTaskEntity(); + task.setId(TASK_ID); + task.setModuleType("COLLECT_DATA"); + task.setStatus("RUNNING"); + task.setTaskNo("CD-29991"); + task.setUserId(7L); + task.setResultJson("{\"brandQueryFailedCount\":" + queryFailedRows + "}"); + return task; + } + + private TaskFileJobEntity job() { + TaskFileJobEntity job = new TaskFileJobEntity(); + job.setTaskId(TASK_ID); + job.setResultId(5001L); + return job; + } + + private FileResultEntity result() { + FileResultEntity result = new FileResultEntity(); + result.setId(5001L); + result.setModuleType("COLLECT_DATA"); + result.setSourceFilename("keywords.xlsx"); + return result; + } + + private String stubHappyPathAndCaptureDetail() { + when(fileTaskMapper.selectById(TASK_ID)).thenReturn(taskWithQueryFailedRows(7)); + when(fileResultMapper.selectById(5001L)).thenReturn(result()); + when(excelAssemblyService.writeWorkbookStreaming(any(), any(), any(), any())).thenReturn(12L); + when(ossStorageService.uploadResultFile(any(), anyString())).thenReturn("collect-data/29991.xlsx"); + // 条件更新返回 1:任务翻成成功,这条「部分缺失」通知才会推给用户 + when(fileTaskMapper.update(isNull(), any())).thenReturn(1); + + service.processResultFileJob(job()); + + ArgumentCaptor detail = ArgumentCaptor.forClass(String.class); + verify(notificationDispatchService).pushPartialResult(eq(7L), eq(TASK_ID), eq("COLLECT_DATA"), + eq("CD-29991"), detail.capture()); + return detail.getValue(); + } + + @Test + void 部分结果通知只说可观测事实_不指认猜测的故障原因() { + String detail = stubHappyPathAndCaptureDetail(); + + assertThat(detail).contains("7 行"); + // 「超时」「被限流」都是这一层观测不到的原因,写进文案会把排查方向带偏 + assertThat(detail).doesNotContain("超时"); + assertThat(detail).doesNotContain("限流"); + } + + @Test + void 部分结果通知保留用户能自己核对的语义() { + String detail = stubHappyPathAndCaptureDetail(); + + assertThat(detail).contains("不计入结果条数"); + assertThat(detail).contains("未返回结果"); + assertThat(detail).contains("重跑"); + } + + @Test + void 任务已被判失败时不推部分结果通知() { + when(fileTaskMapper.selectById(TASK_ID)).thenReturn(taskWithQueryFailedRows(7)); + when(fileResultMapper.selectById(5001L)).thenReturn(result()); + when(excelAssemblyService.writeWorkbookStreaming(any(), any(), any(), any())).thenReturn(12L); + when(ossStorageService.uploadResultFile(any(), anyString())).thenReturn("collect-data/29991.xlsx"); + when(fileTaskMapper.update(isNull(), any())).thenReturn(0); + + service.processResultFileJob(job()); + + verify(notificationDispatchService, org.mockito.Mockito.never()) + .pushPartialResult(anyLong(), anyLong(), anyString(), anyString(), anyString()); + } +}