feat(keywordusage): 新增关键词使用记录并归位店铺管理菜单
V175 把品牌Gating库从数据管理组迁到店铺管理组(排序85),并在其后新增 关键词使用记录独立菜单(排序86)。后端新增只读查询模块,按公司范围读取 keyword_usage/keyword_add_log/keyword_delete_log,前端提供使用/删除记录、 统计卡与筛选。
This commit is contained in:
@@ -63,7 +63,9 @@ class MigratedSqlEquivalenceTest {
|
||||
// (SqlLayeringConventionTest.XML_STATEMENT_TOTAL 同轮 124 → 126)。
|
||||
// 88 → 89:B28 新增 TaskFileJobMapper#selectFileTaskStatus(按主键读父任务状态),逐条点入
|
||||
// (SqlLayeringConventionTest.XML_STATEMENT_TOTAL 同轮 128 → 129)。
|
||||
private static final int XML_SELECT_TOTAL = 89;
|
||||
// 89 → 99:关键词使用记录管理端(keywordusage 模块)新写 10 条只读 select,逐条点入
|
||||
// (SqlLayeringConventionTest.XML_STATEMENT_TOTAL 同轮 130 → 140)。
|
||||
private static final int XML_SELECT_TOTAL = 99;
|
||||
|
||||
/**
|
||||
* 不是「从注解搬过来」的语句:注解时代没有原文可对撞,等价性这支只能跳过它们。
|
||||
@@ -103,7 +105,18 @@ class MigratedSqlEquivalenceTest {
|
||||
// B28(2026-10-25)新写的 1 条主键点查:父任务是否已终态。
|
||||
"TaskFileJobMapper#selectFileTaskStatus",
|
||||
// CR-01(2026-10-25)新写的 1 条写侧语句:会话世代原子自增。
|
||||
"LoginUserMapper#incrementSessionEpoch");
|
||||
"LoginUserMapper#incrementSessionEpoch",
|
||||
// 关键词使用记录管理端(2026-10-25)新写的 10 条只读 select。
|
||||
"KeywordUsageAdminMapper#countUsageRows",
|
||||
"KeywordUsageAdminMapper#selectUsageRows",
|
||||
"KeywordUsageAdminMapper#countCopy",
|
||||
"KeywordUsageAdminMapper#countCopyExisting",
|
||||
"KeywordUsageAdminMapper#countAdd",
|
||||
"KeywordUsageAdminMapper#countDeletes",
|
||||
"KeywordUsageAdminMapper#selectDeleteRows",
|
||||
"KeywordUsageAdminMapper#selectStats",
|
||||
"KeywordUsageAdminMapper#selectUsers",
|
||||
"KeywordUsageAdminMapper#selectCountries");
|
||||
|
||||
/** 账本 5 列:接口 / 方法 / @Select 种类 / 是否含常量插值 / 注解原文(Java 反转义后那条串)。 */
|
||||
private static final int LEDGER_COLUMNS = 5;
|
||||
|
||||
@@ -82,7 +82,8 @@ class SqlLayeringConventionTest {
|
||||
// 新写语句按约定直接进 XML,同轮登记进 MigratedSqlEquivalenceTest.NOT_MIGRATED(88 → 89)。
|
||||
// 129 → 130:CR-01 新增 {@code LoginUserMapper#incrementSessionEpoch}(会话世代原子自增),
|
||||
// 新写语句直接进 mapper/auth/LoginUserMapper.xml,同轮登记进 NOT_MIGRATED。
|
||||
private static final int XML_STATEMENT_TOTAL = 130;
|
||||
// 130 → 140:关键词使用记录管理端(keywordusage 模块,1 份 XML 10 条只读 select)新写语句。
|
||||
private static final int XML_STATEMENT_TOTAL = 140;
|
||||
|
||||
/**
|
||||
* wrapper 里夹带函数级 SQL 的现状("这不是简单单表"的证据),文件名 → 条数:
|
||||
|
||||
+132
@@ -0,0 +1,132 @@
|
||||
package com.nanri.aiimage.modules.keywordusage.service;
|
||||
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.keywordusage.mapper.KeywordUsageAdminMapper;
|
||||
import com.nanri.aiimage.modules.keywordusage.model.dto.KeywordUsageFilterQuery;
|
||||
import com.nanri.aiimage.modules.keywordusage.model.vo.KeywordUsageOverviewVo;
|
||||
import com.nanri.aiimage.modules.keywordusage.model.vo.KeywordUsagePageVo;
|
||||
import com.nanri.aiimage.modules.keywordusage.model.vo.KeywordUsageStatsVo;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
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.junit.jupiter.MockitoExtension;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class KeywordUsageAdminServiceTest {
|
||||
|
||||
@Mock
|
||||
private KeywordUsageAdminMapper keywordUsageAdminMapper;
|
||||
|
||||
@InjectMocks
|
||||
private KeywordUsageAdminService service;
|
||||
|
||||
@Test
|
||||
@DisplayName("概览:已删除词=复制-现存,合计=复制+添加,五国在筛选国家首位")
|
||||
void overviewComputesDerivedStatsAndCountryOrder() {
|
||||
KeywordUsageStatsVo stats = new KeywordUsageStatsVo();
|
||||
stats.setUsed(10);
|
||||
stats.setExist(7);
|
||||
stats.setAdded(3);
|
||||
stats.setDeletes(2);
|
||||
when(keywordUsageAdminMapper.selectStats(1L)).thenReturn(stats);
|
||||
when(keywordUsageAdminMapper.selectCountries(1L)).thenReturn(List.of("美国", "英国"));
|
||||
when(keywordUsageAdminMapper.selectUsers(1L)).thenReturn(List.of("alice"));
|
||||
|
||||
KeywordUsageOverviewVo vo = service.overview(1L);
|
||||
|
||||
assertThat(vo.getStats().getDeletedKw()).isEqualTo(3);
|
||||
assertThat(vo.getStats().getTotalUse()).isEqualTo(13);
|
||||
assertThat(vo.getCountries()).containsExactly("英国", "德国", "法国", "西班牙", "意大利", "美国");
|
||||
assertThat(vo.getUsers()).containsExactly("alice");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("使用记录 scene=已使用:只查复制支,添加支为零且不发起查询")
|
||||
void usageSceneCopyOnly() {
|
||||
when(keywordUsageAdminMapper.countUsageRows(any())).thenReturn(5L);
|
||||
when(keywordUsageAdminMapper.countCopy(any())).thenReturn(5L);
|
||||
when(keywordUsageAdminMapper.countCopyExisting(any())).thenReturn(4L);
|
||||
when(keywordUsageAdminMapper.selectUsageRows(any())).thenReturn(List.of());
|
||||
|
||||
KeywordUsagePageVo vo = service.usage(1L, "alice", null, null, "已使用", 1L, 15L);
|
||||
|
||||
assertThat(vo.getTotal()).isEqualTo(5);
|
||||
assertThat(vo.getCounts().getCopy()).isEqualTo(5);
|
||||
assertThat(vo.getCounts().getCopyDeleted()).isEqualTo(1);
|
||||
assertThat(vo.getCounts().getAdd()).isZero();
|
||||
verify(keywordUsageAdminMapper, never()).countAdd(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("未知场景直接拒绝,不落任何查询")
|
||||
void unknownSceneRejected() {
|
||||
assertThatThrownBy(() -> service.usage(1L, null, null, null, "未知场景", 1L, 15L))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("scene");
|
||||
verify(keywordUsageAdminMapper, never()).countUsageRows(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("分页参数:page<1 归一为 1,page_size 上限 100")
|
||||
void pageParamsAreClamped() {
|
||||
when(keywordUsageAdminMapper.countUsageRows(any())).thenReturn(0L);
|
||||
when(keywordUsageAdminMapper.countCopy(any())).thenReturn(0L);
|
||||
when(keywordUsageAdminMapper.countCopyExisting(any())).thenReturn(0L);
|
||||
when(keywordUsageAdminMapper.countAdd(any())).thenReturn(0L);
|
||||
when(keywordUsageAdminMapper.selectUsageRows(any())).thenReturn(List.of());
|
||||
|
||||
service.usage(1L, null, null, null, null, 0L, 1000L);
|
||||
|
||||
ArgumentCaptor<KeywordUsageFilterQuery> captor = ArgumentCaptor.forClass(KeywordUsageFilterQuery.class);
|
||||
verify(keywordUsageAdminMapper).selectUsageRows(captor.capture());
|
||||
assertThat(captor.getValue().getOffset()).isZero();
|
||||
assertThat(captor.getValue().getLimit()).isEqualTo(100);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("控制器与 Mapper 契约:独立菜单权限键、逐端点走公司范围门、XML 只读四表")
|
||||
void controllerAndMapperContract() throws Exception {
|
||||
String controller = Files.readString(Path.of(
|
||||
"src/main/java/com/nanri/aiimage/modules/keywordusage/controller/AdminKeywordUsageController.java"),
|
||||
StandardCharsets.UTF_8);
|
||||
assertThat(controller).contains("PERMISSION_KEY = \"admin_keyword_usage\"");
|
||||
assertThat(count(controller, "readCompanyIdOrOwn(operator, companyId)")).isEqualTo(3);
|
||||
assertThat(count(controller, "@RequestParam(name = \"company_id\"")).isEqualTo(3);
|
||||
assertThat(controller).contains("adminAuthSupport.requireUser(request)");
|
||||
assertThat(controller).contains("requireConsolePageAccess(operator, DENIAL_MESSAGE, PERMISSION_KEY)");
|
||||
|
||||
String xml = Files.readString(Path.of(
|
||||
"src/main/resources/mapper/keywordusage/KeywordUsageAdminMapper.xml"), StandardCharsets.UTF_8);
|
||||
assertThat(xml).contains("keyword_usage")
|
||||
.contains("keyword_add_log")
|
||||
.contains("keyword_delete_log")
|
||||
.contains("keyword_share");
|
||||
assertThat(xml).doesNotContain("${");
|
||||
assertThat(count(xml, "<select ")).isEqualTo(10);
|
||||
}
|
||||
|
||||
private static int count(String text, String token) {
|
||||
int hits = 0;
|
||||
int at = 0;
|
||||
while ((at = text.indexOf(token, at)) >= 0) {
|
||||
hits++;
|
||||
at += token.length();
|
||||
}
|
||||
return hits;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user