feat(phase-3): 后管无侵权只读页——私有鉴权闸+readCompanyIdOrOwn 公司隔离+分页钳制;前端自绘表格页与路由/操作提示/五护栏同轮记账
后端:AdminAppearancePatentCleanItemsController(GET /api/admin/appearance-patent-clean-items,requireCleanItemsAccess 照去重页形状)+ AppearancePatentCleanItemQueryService(page≤10000/size≤100 钳制防 (page-1)*page_size 溢出)+两 VO;PageDefaults 第五种 page_size=10 显式登记。前端:AppearancePatentCleanItemsPage(自绘 table+OldPagination,companyScoped)+api/filter/model 拆件;routes/company-scope/operation-guides 收口。护栏:company-tab-wiring 24 处发送口、date-range-order 分母 21 实例/9 对、date-guard EXEMPT、ChunkRow 无侵权白名单四件(LlmClient 仍是唯一结论值来源)、SourceScan 52 支、G2 WIRED_PAGE_KEYS 第七支。判据修正:columnKey→getColumnKey 对齐代码库命名。
This commit is contained in:
+13
-8
@@ -59,6 +59,8 @@ class PageDefaultsLedgerTest {
|
||||
// (本批 /groups 端点:参数名与默认值和列表端点同,台账按出站点计数、不去重)
|
||||
"AdminNotificationController.java#page=FIRST_PAGE",
|
||||
"AdminNotificationController.java#pageSize=ADMIN_LIST_PAGE_SIZE",
|
||||
"AdminAppearancePatentCleanItemsController.java#page=FIRST_PAGE",
|
||||
"AdminAppearancePatentCleanItemsController.java#page_size=CLEAN_ITEMS_PAGE_SIZE",
|
||||
"AppearancePatentController.java#limit=DEFAULT_RESULT_LIMIT",
|
||||
"CollectDataController.java#page=FIRST_PAGE",
|
||||
"CollectDataController.java#page_size=TASK_LIST_PAGE_SIZE",
|
||||
@@ -109,10 +111,10 @@ class PageDefaultsLedgerTest {
|
||||
List<String> constants = actual.stream().filter(s -> !s.contains("LITERAL")).sorted().toList();
|
||||
|
||||
assertThat(constants)
|
||||
.as("54 处分页/条数出站点的具名默认值必须与台账一一对应")
|
||||
.as("56 处分页/条数出站点的具名默认值必须与台账一一对应")
|
||||
.isEqualTo(LEDGER.stream().sorted().toList());
|
||||
// 同口径非零对照:台账不是空的,扫描器也确实数得出 54 处
|
||||
assertThat(constants).hasSize(54);
|
||||
// 同口径非零对照:台账不是空的,扫描器也确实数得出 56 处
|
||||
assertThat(constants).hasSize(56);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -128,11 +130,12 @@ class PageDefaultsLedgerTest {
|
||||
List<String> actual = sites();
|
||||
assertThat(kindsUsing(actual, "page", "FIRST_PAGE"))
|
||||
.as("页码口径只有一套:全部从 1 起")
|
||||
.isEqualTo(24);
|
||||
.isEqualTo(25);
|
||||
assertThat(distinctConstants(actual, "page_size"))
|
||||
.as("page_size 的默认容量集合:15/20/50/1000 四种各自登记,新来第五种要红")
|
||||
.as("page_size 的默认容量集合:10/15/20/50/1000 五种各自登记,新来第六种要红"
|
||||
+ "(10 是 v1.3 无侵权只读页,蓝图 §3.2 拍板、与前端 OldPagination 首屏同值)")
|
||||
.containsExactlyInAnyOrder("USER_LIST_PAGE_SIZE", "ADMIN_LIST_PAGE_SIZE",
|
||||
"TASK_LIST_PAGE_SIZE", "FULL_EXPORT_PAGE_SIZE");
|
||||
"TASK_LIST_PAGE_SIZE", "FULL_EXPORT_PAGE_SIZE", "CLEAN_ITEMS_PAGE_SIZE");
|
||||
// 同一个语义有两种拼写(@RequestParam(name = "page_size") 与 camelCase 的 pageSize),
|
||||
// 而两种拼写实际用到的常量本来就不同。原来把同一个四项清单套在两种拼写上,
|
||||
// 红的是台账写法而不是有人新增了默认值——2026-10-10 出包前对平这一条。
|
||||
@@ -143,9 +146,10 @@ class PageDefaultsLedgerTest {
|
||||
bothSpellings.addAll(distinctConstants(actual, "page_size"));
|
||||
bothSpellings.addAll(distinctConstants(actual, "pageSize"));
|
||||
assertThat(bothSpellings)
|
||||
.as("两种拼写合起来仍只许那四种容量:谁长出第五种,这里就红")
|
||||
.as("两种拼写合起来仍只许那五种容量:谁长出第六种,这里就红")
|
||||
.containsExactlyInAnyOrderElementsOf(java.util.List.of("USER_LIST_PAGE_SIZE",
|
||||
"ADMIN_LIST_PAGE_SIZE", "TASK_LIST_PAGE_SIZE", "FULL_EXPORT_PAGE_SIZE"));
|
||||
"ADMIN_LIST_PAGE_SIZE", "TASK_LIST_PAGE_SIZE", "FULL_EXPORT_PAGE_SIZE",
|
||||
"CLEAN_ITEMS_PAGE_SIZE"));
|
||||
assertThat(distinctConstants(actual, "limit"))
|
||||
.as("limit 是「本次最多返回几条」,不许和 page_size 混用同一批常量")
|
||||
.containsExactlyInAnyOrder("DEFAULT_RESULT_LIMIT", "ADMIN_SCAN_LIMIT");
|
||||
@@ -171,6 +175,7 @@ class PageDefaultsLedgerTest {
|
||||
// 具名常量给了 String 与 int 两个面,两者一旦漂开,注解上的默认值和代码里的兜底值就不是一个数
|
||||
assertPair(PageDefaults.FIRST_PAGE, PageDefaults.FIRST_PAGE_INT);
|
||||
assertPair(PageDefaults.USER_LIST_PAGE_SIZE, PageDefaults.USER_LIST_PAGE_SIZE_INT);
|
||||
assertPair(PageDefaults.CLEAN_ITEMS_PAGE_SIZE, PageDefaults.CLEAN_ITEMS_PAGE_SIZE_INT);
|
||||
assertPair(PageDefaults.ADMIN_LIST_PAGE_SIZE, PageDefaults.ADMIN_LIST_PAGE_SIZE_INT);
|
||||
assertPair(PageDefaults.TASK_LIST_PAGE_SIZE, PageDefaults.TASK_LIST_PAGE_SIZE_INT);
|
||||
assertPair(PageDefaults.FULL_EXPORT_PAGE_SIZE, PageDefaults.FULL_EXPORT_PAGE_SIZE_INT);
|
||||
|
||||
+12
-3
@@ -204,11 +204,19 @@ class CompanyIdParamGoesThroughReadScopeTest {
|
||||
private static final String SCOPE_CAUGHT_SHOP_KEY_KEY =
|
||||
"com/nanri/aiimage/modules/shopkey/controller/ShopKeyController.java#@GetMapping";
|
||||
|
||||
/**
|
||||
* v1.3(2026-11-10)无侵权只读页接的第九支:{@code biz_appearance_patent_clean_item} 与店铺密钥
|
||||
* 同形状(V189 归属物化在行 {@code company_id} 列、可见集不靠账号/分组)⇒ 正门同为
|
||||
* {@code readCompanyIdOrOwn}:超管显式传才收窄、不传全量,非超管强制本公司(忽略请求传参)。
|
||||
*/
|
||||
private static final String SCOPE_CAUGHT_CLEAN_ITEMS_KEY =
|
||||
"com/nanri/aiimage/modules/appearancepatent/controller/AdminAppearancePatentCleanItemsController.java#@GetMapping";
|
||||
|
||||
/**
|
||||
* 射程下限的<b>唯一一份</b>名单:C 与 D 两条射程断言共用它,不许各写一份(两处各写就会有一处先漂)。
|
||||
* 这六支是"切 tab 数据还是一样"这次报障正对着的页面里<b>今天仍按公司取数</b>的那些:
|
||||
* 这七支是"切 tab 数据还是一样"这次报障正对着的页面里<b>今天仍按公司取数</b>的那些:
|
||||
* 批次 1 的两页(图片历史、图片视频任务)+ 批次 2 剩下三页(去重库、查询ASIN、最低价ASIN)
|
||||
* + V150 的店铺密钥。
|
||||
* + V150 的店铺密钥 + v1.3 的无侵权只读页。
|
||||
* <p>品牌库、商品类目 2026-10-06 定案退回全平台共享({@link #SHARED_TABLES_MUST_STAY_UNSCOPED}),
|
||||
* 它们的公司参数已从 controller 上摘掉,留在这里只会让 {@code contains(...)} 恒红——
|
||||
* "不得回流"改由那一条反向钉看守,不靠射程名单。</p>
|
||||
@@ -219,7 +227,8 @@ class CompanyIdParamGoesThroughReadScopeTest {
|
||||
SCOPE_CAUGHT_DEDUPE_KEY,
|
||||
SCOPE_CAUGHT_QUERY_ASIN_KEY,
|
||||
SCOPE_CAUGHT_SKIP_PRICE_ASIN_KEY,
|
||||
SCOPE_CAUGHT_SHOP_KEY_KEY);
|
||||
SCOPE_CAUGHT_SHOP_KEY_KEY,
|
||||
SCOPE_CAUGHT_CLEAN_ITEMS_KEY);
|
||||
|
||||
private static final String READ_SCOPE_CALL = "readScope(";
|
||||
/**
|
||||
|
||||
+175
-12
@@ -1,34 +1,61 @@
|
||||
package com.nanri.aiimage.modules.appearancepatent.controller;
|
||||
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.api.PageDefaults;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.service.DataReadScope;
|
||||
import com.nanri.aiimage.modules.appearancepatent.mapper.AppearancePatentCleanItemMapper;
|
||||
import com.nanri.aiimage.modules.appearancepatent.model.entity.CleanItemEntity;
|
||||
import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentCleanItemPageVo;
|
||||
import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentCleanItemVo;
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentCleanItemQueryService;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.ArgumentMatchers.isNull;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* AC-4/AC-6/AC-7(v1.3 R2/R4/R5):后管「外观专利无侵权数据」只读查询接口与菜单可见性。
|
||||
*
|
||||
* <p>Pending Phase 3 激活。Phase 0 预置的是<b>接缝判据</b>(接缝名是判据的一部分,Phase 3 微调命名
|
||||
* 必须同步改本文件并在蓝图 §5 登记);激活时除本清单外,再补真实对象的行为样本:</p>
|
||||
* <p>Phase 3 已激活。前 7 支是 Phase 0 预置的<b>接缝判据</b>(接缝名是判据的一部分,改名必须
|
||||
* 同步改本文件并在蓝图 §5 登记);后 5 支是激活时补的真实对象行为样本:</p>
|
||||
*
|
||||
* <ul>
|
||||
* <li><b>AC-4</b>:公司隔离——超管显式传 company_id 收窄、不传全量;非超管强制本公司(忽略请求
|
||||
* 传参);无凭据/坏凭据按业务码拒绝(200 信封形状;判据认业务码/拒绝文案,不认 HTTP 码,B80-03);</li>
|
||||
* 传参);无凭据/坏凭据按业务码拒绝(200 信封形状;判据认业务码/拒绝文案,不认 HTTP 码,B80-03);
|
||||
* <b>接缝随实作微调(已在蓝图 §5 登记)</b>:本表与店铺密钥同形状(归属物化在行 company_id 列、
|
||||
* 可见集不靠账号/分组),正门是 {@code readCompanyIdOrOwn}——{@code superAdminScopedCompanyId}
|
||||
* 对非超管返回 null,按行 company_id 列查询时等于把整张表交给每一家(该方法 javadoc 点名的
|
||||
* 越权形状),非超管「强制本公司」必须走 {@code CompanyScopeSupport.requireCompanyId} 那一支;</li>
|
||||
* <li><b>AC-6</b>:默认仅 super_admin 可见可访问(V21 形状:菜单注册不预授权);被授权角色放行;
|
||||
* page 钳制防 {@code (page-1)*page_size} 溢出(铁律 15);</li>
|
||||
* page 钳制防 {@code (page-1)*page_size} 溢出(铁律 15,行为样本见查询服务钳制支);</li>
|
||||
* <li><b>AC-7</b>:删除前台任务/历史结果后,后管同步记录仍可查(独立保留)。</li>
|
||||
* </ul>
|
||||
*/
|
||||
@Disabled("Pending Phase 3: AC-4/AC-6/AC-7 后管只读查询接口与菜单可见性(激活时移除本注解)")
|
||||
class AdminAppearancePatentCleanItemsControllerTest {
|
||||
|
||||
private static final Path MODULE = Path.of("").toAbsolutePath();
|
||||
@@ -42,6 +69,8 @@ class AdminAppearancePatentCleanItemsControllerTest {
|
||||
private static final String COLUMN_KEY = "admin_appearance_patent_clean_items";
|
||||
private static final String ROUTE_PATH = "patent-center/clean-items";
|
||||
|
||||
// ===================== Phase 0 预置接缝判据(激活) =====================
|
||||
|
||||
@Test
|
||||
void 控制器与只读端点就位() throws IOException {
|
||||
assertTrue(Files.exists(CONTROLLER),
|
||||
@@ -63,16 +92,22 @@ class AdminAppearancePatentCleanItemsControllerTest {
|
||||
assertTrue(source.contains(seam), "鉴权闸缺接缝 " + seam
|
||||
+ "——照 DedupeTotalDataController 私有 requireXxxAccess 形状(JWT→内部令牌回退→超管放行→菜单双匹配)");
|
||||
}
|
||||
assertTrue(source.contains("columnKey") && (source.contains("getRoutePath")),
|
||||
"菜单权限必须 column_key/route_path 双匹配(AC-6:默认不命中即拒)");
|
||||
assertTrue(source.contains("getColumnKey") && (source.contains("getRoutePath")),
|
||||
"菜单权限必须 column_key/route_path 双匹配(AC-6:默认不命中即拒);"
|
||||
+ "判据随实作对齐代码库命名——item.getColumnKey()(激活时修正,原写法 columnKey 永不命中)");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 公司隔离走superAdminScopedCompanyId() throws IOException {
|
||||
void 公司隔离走readCompanyIdOrOwn() throws IOException {
|
||||
String source = stripComments(Files.readString(CONTROLLER));
|
||||
assertTrue(source.contains("DataReadScope"), "公司隔离唯一出口是 DataReadScope(蓝图 §2.1 Level 0)");
|
||||
assertTrue(source.contains("superAdminScopedCompanyId"),
|
||||
"读侧必须走 superAdminScopedCompanyId:超管显式传才收窄,非超管强制本公司(AC-4,同去重页口径)");
|
||||
// 接缝随实作微调(蓝图 §5 已登记):本表与店铺密钥同形状(V189 归属物化列、无账号集兜底),
|
||||
// 正门是 readCompanyIdOrOwn——超管显式传才收窄、非超管强制本公司(AC-4 后半句的行为要求)。
|
||||
// superAdminScopedCompanyId 对非超管返回 null=整张表放开,不是本表该走的门。
|
||||
assertTrue(source.contains("readCompanyIdOrOwn"),
|
||||
"读侧必须走 readCompanyIdOrOwn:超管显式传才收窄,非超管强制本公司(AC-4,同店铺密钥 biz_shop_key 口径)");
|
||||
assertFalse(source.contains("superAdminScopedCompanyId"),
|
||||
"不得走 superAdminScopedCompanyId:它对非超管返回 null=按行 company_id 查询时把整张表交给每一家");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -83,7 +118,7 @@ class AdminAppearancePatentCleanItemsControllerTest {
|
||||
assertTrue(source.contains(param), "查询参数必须 snake_case:" + param + "(蓝图 §3.2,照去重页参数归一形状)");
|
||||
}
|
||||
assertTrue(source.contains("PageDefaults"), "page/page_size 默认值必须取 PageDefaults(page_size 默认 10);"
|
||||
+ "page 钳制防 (page-1)*page_size 溢出的行为样本在激活时以真实对象补(铁律 15)");
|
||||
+ "page 钳制防 (page-1)*page_size 溢出的行为样本见查询服务钳制支(铁律 15)");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -136,6 +171,134 @@ class AdminAppearancePatentCleanItemsControllerTest {
|
||||
}
|
||||
}
|
||||
|
||||
// ===================== 激活时补的真实对象行为样本 =====================
|
||||
|
||||
@Test
|
||||
void 控制器把公司参数交给readCompanyIdOrOwn并把结果装进200信封() {
|
||||
AppearancePatentCleanItemMapper mapper = mock(AppearancePatentCleanItemMapper.class);
|
||||
AppearancePatentCleanItemQueryService queryService = mock(AppearancePatentCleanItemQueryService.class);
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
PermissionMenuService permissionMenuService = mock(PermissionMenuService.class);
|
||||
DataReadScope dataReadScope = mock(DataReadScope.class);
|
||||
AdminAppearancePatentCleanItemsController controller = new AdminAppearancePatentCleanItemsController(
|
||||
queryService, authSupport, permissionMenuService, dataReadScope);
|
||||
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(7L);
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
when(authSupport.requireUser(request)).thenReturn(operator);
|
||||
when(authSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
// 超管显式传 company_id=5 ⇒ 正门把 5 交出来(不传时正门给 null=全量,同一行为样本家族)。
|
||||
when(dataReadScope.readCompanyIdOrOwn(operator, 5L)).thenReturn(5L);
|
||||
AppearancePatentCleanItemPageVo pageVo = new AppearancePatentCleanItemPageVo();
|
||||
pageVo.setItems(List.of());
|
||||
pageVo.setTotal(0L);
|
||||
pageVo.setPage(1L);
|
||||
pageVo.setPageSize((long) PageDefaults.CLEAN_ITEMS_PAGE_SIZE_INT);
|
||||
when(queryService.page(1L, 10L, null, null, null, null, null, 5L)).thenReturn(pageVo);
|
||||
|
||||
ApiResponse<AppearancePatentCleanItemPageVo> response =
|
||||
controller.page(1L, 10L, null, null, null, null, null, 5L, request);
|
||||
|
||||
verify(dataReadScope).readCompanyIdOrOwn(operator, 5L);
|
||||
verify(queryService).page(1L, 10L, null, null, null, null, null, 5L);
|
||||
assertEquals(Boolean.TRUE, response.isSuccess(), "拒绝走 403 业务码,放行必须是 success 信封(B80-03)");
|
||||
assertEquals(pageVo, response.getData());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 查询服务分页钳制防溢出() {
|
||||
AppearancePatentCleanItemMapper mapper = mock(AppearancePatentCleanItemMapper.class);
|
||||
AppearancePatentCleanItemQueryService service = new AppearancePatentCleanItemQueryService(mapper);
|
||||
when(mapper.countCleanItems(any(), any(), any(), any(), any(), any())).thenReturn(1L);
|
||||
|
||||
// page=0 / size=null ⇒ 归一为第 1 页、默认 10 条;offset = 0。
|
||||
service.page(0L, null, null, null, null, null, null, null);
|
||||
ArgumentCaptor<Long> offset = ArgumentCaptor.forClass(Long.class);
|
||||
ArgumentCaptor<Integer> limit = ArgumentCaptor.forClass(Integer.class);
|
||||
verify(mapper).selectCleanItemPage(isNull(), isNull(), isNull(), isNull(), isNull(), isNull(),
|
||||
offset.capture(), limit.capture());
|
||||
assertEquals(0L, offset.getValue());
|
||||
assertEquals(PageDefaults.CLEAN_ITEMS_PAGE_SIZE_INT, limit.getValue());
|
||||
|
||||
// page=Long.MAX_VALUE / size=500 ⇒ 钳到 10_000 页、100 条;乘积 999_900 不得变负(铁律 15,CR-18 同值)。
|
||||
service.page(Long.MAX_VALUE, 500L, null, null, null, null, null, null);
|
||||
ArgumentCaptor<Long> offsetMax = ArgumentCaptor.forClass(Long.class);
|
||||
ArgumentCaptor<Integer> limitMax = ArgumentCaptor.forClass(Integer.class);
|
||||
verify(mapper, org.mockito.Mockito.times(2)).selectCleanItemPage(any(), any(), any(), any(), any(), any(),
|
||||
offsetMax.capture(), limitMax.capture());
|
||||
assertEquals(999_900L, offsetMax.getValue(), "(page-1)*page_size 最大 999_900,钳制后不得溢出变负");
|
||||
assertEquals(100, limitMax.getValue());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 查询服务公司过滤原样直传() {
|
||||
AppearancePatentCleanItemMapper mapper = mock(AppearancePatentCleanItemMapper.class);
|
||||
AppearancePatentCleanItemQueryService service = new AppearancePatentCleanItemQueryService(mapper);
|
||||
when(mapper.countCleanItems(any(), any(), any(), any(), any(), any())).thenReturn(0L);
|
||||
|
||||
// 超管显式传 5 ⇒ 按公司 5 筛(收窄);null ⇒ 全量(AC-4 前半句)。
|
||||
service.page(1L, 10L, null, null, null, null, null, 5L);
|
||||
verify(mapper).countCleanItems(eq(5L), isNull(), isNull(), isNull(), isNull(), isNull());
|
||||
service.page(1L, 10L, null, null, null, null, null, null);
|
||||
verify(mapper).countCleanItems(isNull(), isNull(), isNull(), isNull(), isNull(), isNull());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 查询服务日期倒挂拒绝() {
|
||||
AppearancePatentCleanItemMapper mapper = mock(AppearancePatentCleanItemMapper.class);
|
||||
AppearancePatentCleanItemQueryService service = new AppearancePatentCleanItemQueryService(mapper);
|
||||
BusinessException ex = assertThrows(BusinessException.class,
|
||||
() -> service.page(1L, 10L, null, null, null,
|
||||
LocalDate.of(2026, 11, 9), LocalDate.of(2026, 11, 1), null));
|
||||
assertTrue(ex.getMessage().contains("开始日期不能晚于结束日期"),
|
||||
"倒挂日期按业务异常拒绝(同去重页文案口径)");
|
||||
verify(mapper, org.mockito.Mockito.never()).countCleanItems(any(), any(), any(), any(), any(), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 行字段与VO搬运一致不加工() {
|
||||
AppearancePatentCleanItemMapper mapper = mock(AppearancePatentCleanItemMapper.class);
|
||||
AppearancePatentCleanItemQueryService service = new AppearancePatentCleanItemQueryService(mapper);
|
||||
CleanItemEntity entity = new CleanItemEntity();
|
||||
entity.setId(11L);
|
||||
entity.setResultId(901L);
|
||||
entity.setTaskId(33179L);
|
||||
entity.setUserId(7L);
|
||||
entity.setCompanyId(5L);
|
||||
entity.setRowNo(3);
|
||||
entity.setAsin("B0AB8CDEF1");
|
||||
entity.setCountry("DE");
|
||||
entity.setSku("SKU-1");
|
||||
entity.setBrand("Anker");
|
||||
entity.setPrice("29.99");
|
||||
entity.setTitle(" 带空格的标题 ");
|
||||
entity.setImageUrl("https://img.example/1.jpg");
|
||||
entity.setConclusion("无侵权");
|
||||
entity.setTitleReason("标题含品牌词");
|
||||
entity.setSourceFilename("list.xlsx");
|
||||
LocalDateTime syncedAt = LocalDateTime.of(2026, 11, 10, 10, 30);
|
||||
entity.setSyncedAt(syncedAt);
|
||||
when(mapper.countCleanItems(any(), any(), any(), any(), any(), any())).thenReturn(1L);
|
||||
when(mapper.selectCleanItemPage(any(), any(), any(), any(), any(), any(), anyLong(),
|
||||
org.mockito.ArgumentMatchers.anyInt())).thenReturn(List.of(entity));
|
||||
|
||||
AppearancePatentCleanItemPageVo vo = service.page(1L, 10L, 33179L, null, null, null, null, 5L);
|
||||
assertEquals(1L, vo.getTotal());
|
||||
AppearancePatentCleanItemVo row = vo.getItems().get(0);
|
||||
// 读侧只搬运不加工:标题两侧空格原样保留(AC-1「与 payload 一致」,后端不 trim 是与行值同口径)。
|
||||
assertEquals(" 带空格的标题 ", row.getTitle());
|
||||
assertEquals("无侵权", row.getConclusion());
|
||||
assertEquals(901L, row.getResultId());
|
||||
assertEquals(33179L, row.getTaskId());
|
||||
assertEquals(5L, row.getCompanyId());
|
||||
assertEquals(Integer.valueOf(3), row.getRowNo());
|
||||
assertEquals("https://img.example/1.jpg", row.getImageUrl());
|
||||
assertEquals("标题含品牌词", row.getTitleReason());
|
||||
assertEquals("list.xlsx", row.getSourceFilename());
|
||||
assertEquals(syncedAt, row.getSyncedAt());
|
||||
}
|
||||
|
||||
private static Path findCleanItemMapperXml() throws IOException {
|
||||
Path resources = MODULE.resolve("src/main/resources/mapper");
|
||||
if (!Files.exists(resources)) {
|
||||
|
||||
+15
-6
@@ -46,8 +46,10 @@ import static org.mockito.Mockito.when;
|
||||
* <li><b>端到端黄金样本</b>——序列化 → 真读取链
|
||||
* {@link AppearancePatentResultRowReader#readChunkRows} 值等闭合,且「无侵权」与
|
||||
* 「外观无侵权·商标待复核」按精确相等分得开(用户拍板 ①:严格口径);</li>
|
||||
* <li><b>字面量单源扫描</b>——appearancepatent 模块 main 源码里「无侵权」只许出现在
|
||||
* {@code AppearancePatentLlmClient},同步服务落地(Phase 2)后再抄一份即红。</li>
|
||||
* <li><b>字面量白名单扫描</b>——appearancepatent 模块 main 源码里「无侵权」只许落在白名单内:
|
||||
* 唯一<b>结论值</b>来源仍是 {@code AppearancePatentLlmClient};其余命中必须全部是页面名/Swagger
|
||||
* 文案/403 拒绝文案(结论值一律引用 NO_INFRINGEMENT 常量),新增命中必须在此登记,未登记即红
|
||||
* (Phase 3 后管只读页以菜单名「外观专利无侵权数据」命中,已登记)。</li>
|
||||
* </ol>
|
||||
*/
|
||||
class AppearancePatentChunkRowContractTest {
|
||||
@@ -155,7 +157,7 @@ class AppearancePatentChunkRowContractTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
void 无侵权字面量在模块main源码只有LlmClient一份() throws IOException {
|
||||
void 无侵权字面量只许落在登记白名单() throws IOException {
|
||||
Set<String> flagged = new TreeSet<>();
|
||||
try (Stream<Path> files = Files.walk(MAIN_APPEARANCE_PATENT)) {
|
||||
files.filter(path -> path.toString().endsWith(".java"))
|
||||
@@ -167,9 +169,16 @@ class AppearancePatentChunkRowContractTest {
|
||||
});
|
||||
}
|
||||
assertFalse(flagged.isEmpty(), "扫描空跑=判据失效:LlmClient 自身必须命中");
|
||||
assertIterableEquals(List.of("client/AppearancePatentLlmClient.java"), new ArrayList<>(flagged),
|
||||
"「无侵权」字面量只许存在于 AppearancePatentLlmClient(判定口径单一来源);"
|
||||
+ "同步/导出/查询侧一律引用 NO_INFRINGEMENT 常量,注释里的举例不算(本判据已剥离注释)");
|
||||
// 结论值唯一来源仍是 LlmClient(NO_INFRINGEMENT 常量);白名单其余条目必须是页面名/文档
|
||||
// 文案,不得出现第二个"造结论"的出处。新增命中必须在此登记并说明为何不产结论值。
|
||||
assertIterableEquals(List.of(
|
||||
"client/AppearancePatentLlmClient.java",
|
||||
"controller/AdminAppearancePatentCleanItemsController.java",
|
||||
"model/vo/AppearancePatentCleanItemPageVo.java",
|
||||
"model/vo/AppearancePatentCleanItemVo.java"), new ArrayList<>(flagged),
|
||||
"「无侵权」字面量只许落在登记白名单(LlmClient=结论值单一来源;控制器/VO 命中全是"
|
||||
+ "菜单名/Swagger/403 文案);同步/导出/查询侧产结论值一律引用 NO_INFRINGEMENT 常量,"
|
||||
+ "注释里的举例不算(本判据已剥离注释)");
|
||||
}
|
||||
|
||||
private static String readSafely(Path path) {
|
||||
|
||||
@@ -263,7 +263,7 @@ class SourceScanTest {
|
||||
.count();
|
||||
|
||||
assertThat(uniqueNames)
|
||||
.as("973 支文件 / 970 个唯一名 ⇒ 确有 3 组同名。相等就说明同名面被搬空了,N5 的台账要同步改")
|
||||
.as("977 支文件 / 974 个唯一名 ⇒ 确有 3 组同名。相等就说明同名面被搬空了,N5 的台账要同步改")
|
||||
.isLessThan((long) all.size());
|
||||
}
|
||||
|
||||
@@ -314,16 +314,21 @@ class SourceScanTest {
|
||||
// ---------------------------------------------------------------- N6 moduleSources
|
||||
|
||||
@Test
|
||||
void moduleSources_appearancepatent返回47支含拆分后的support件() {
|
||||
void moduleSources_appearancepatent登记数与真实文件同号() {
|
||||
List<Path> files = SourceScan.moduleSources("modules/appearancepatent");
|
||||
|
||||
assertThat(files)
|
||||
.as("真实集成:对真仓目录求值。47 支=1 controller+1 client+1 service 主件+4 spi/cache+"
|
||||
+ "21 service/support+16 model(dto7/vo9),与 find 实测同号"
|
||||
.as("真实集成:对真仓目录求值。52 支=2 controller+1 client+8 service 根件"
|
||||
+ "(主件/只读查询/同步/出表作业/缓存/心跳与拉取与重试 SPI)"
|
||||
+ "+21 service/support+19 model(dto7/entity1/vo11)+1 mapper,"
|
||||
+ "与 find 实测同号"
|
||||
+ "(3A 拆薄第十三笔再落 5 支;失败任务重试再落 1 支 RetrySpi;"
|
||||
+ "v1.3 Phase 1 无侵权同步底座再落 2 支:model/entity/CleanItemEntity+"
|
||||
+ "mapper/AppearancePatentCleanItemMapper)")
|
||||
.hasSize(47);
|
||||
+ "mapper/AppearancePatentCleanItemMapper;Phase 2 同步服务再落 1 支"
|
||||
+ " AppearancePatentCleanSyncService;Phase 3 只读页再落 4 支:"
|
||||
+ "controller/AdminAppearancePatentCleanItemsController+"
|
||||
+ "service/AppearancePatentCleanItemQueryService+model/vo 两件)")
|
||||
.hasSize(52);
|
||||
assertThat(files.stream().map(p -> p.toString().replace('\\', '/')).toList())
|
||||
.as("support 目录里的既有件必须在面里——聚合入口存在的理由就是拆分后的新文件要自动被看到")
|
||||
.anyMatch(rel -> rel.endsWith("service/support/AppearancePatentRowNormalizer.java"));
|
||||
@@ -459,7 +464,7 @@ class SourceScanTest {
|
||||
.isEqualTo(7);
|
||||
assertThat(rel.stream().filter(p -> p.contains("/model/vo/")).count())
|
||||
.as("model/vo 一层嵌套")
|
||||
.isEqualTo(9);
|
||||
.isEqualTo(11);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user