diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/controller/BrandGatingController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/controller/BrandGatingController.java new file mode 100644 index 000000000..d68a66784 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/controller/BrandGatingController.java @@ -0,0 +1,118 @@ +package com.nanri.aiimage.modules.brandgating.controller; + +import com.nanri.aiimage.common.api.ApiResponse; +import com.nanri.aiimage.common.model.entity.AdminUserEntity; +import com.nanri.aiimage.common.security.AdminAuthSupport; +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingAddRequest; +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingImportRequest; +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingStatusRequest; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingAddResultVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingDeleteResultVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingImportResultVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingPageVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingStatsVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingStatusResultVo; +import com.nanri.aiimage.modules.brandgating.service.BrandGatingService; +import com.nanri.aiimage.modules.permission.service.PermissionMenuService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * 品牌Gating库(管理后台):独立小网页后台(gating_web_admin.py)并入数富管理后台, + * 共用主库同一张 biz_brand_gating 表。 + * + *

页面权限键 {@code admin_brand_gating}(后台菜单 column_key,经 + * {@link PermissionMenuService#requireConsolePageAccess} 把门);鉴权第一道门由 + * AdminApiGuardFilter 的 /api/admin 前缀兜底(见 ApiGuardCoverageAuditor 口径)。

+ */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/admin/brand-gating") +@Tag(name = "品牌Gating库(后台)", description = "品牌Gating库的列表/筛选/统计、单条新增、启停、删除与批量导入。") +public class BrandGatingController { + + /** 后台菜单权限键(columns.column_key,与 V164 菜单行同键)。 */ + private static final String PERMISSION_KEY = "admin_brand_gating"; + private static final String DENIAL_MESSAGE = "无权访问品牌Gating库"; + + private final BrandGatingService brandGatingService; + private final AdminAuthSupport adminAuthSupport; + private final PermissionMenuService permissionMenuService; + + @GetMapping + @Operation(summary = "分页查询品牌Gating库", description = "keyword 模糊匹配品牌/ASIN,country/gatingType/status/source 精确筛选,ORDER BY id DESC。") + public ApiResponse page( + HttpServletRequest request, + @Parameter(description = "品牌/ASIN 模糊搜索") @RequestParam(name = "keyword", required = false) String keyword, + @Parameter(description = "国家(「全部」= 不限)") @RequestParam(name = "country", required = false) String country, + @Parameter(description = "Gating 类型(「全部」= 不限)") @RequestParam(name = "gatingType", required = false) String gatingType, + @Parameter(description = "状态:1=生效 0=停用,不传=全部") @RequestParam(name = "status", required = false) String status, + @Parameter(description = "来源(「全部」= 不限)") @RequestParam(name = "source", required = false) String source, + @Parameter(description = "页码(1 起)") @RequestParam(name = "page", required = false) Long page, + @Parameter(description = "每页数量(默认 10,上限 200)") @RequestParam(name = "size", required = false) Long size) { + requireBrandGatingAccess(request); + return ApiResponse.success(brandGatingService.page(page, size, keyword, country, gatingType, status, source)); + } + + @GetMapping("/stats") + @Operation(summary = "品牌Gating库统计", description = "total/active/disabled/brands 与按类型/国家/来源的分布(分组只数生效行,国家按 count DESC)。") + public ApiResponse stats(HttpServletRequest request) { + requireBrandGatingAccess(request); + return ApiResponse.success(brandGatingService.stats()); + } + + @PostMapping + @Operation(summary = "单条新增", description = "brand 必填;缺省字段落桌面版同款默认(country=全部、gatingType=品牌gating、source=MANUAL);撞唯一键回 added=0。") + public ApiResponse add( + HttpServletRequest request, + @Valid @RequestBody BrandGatingAddRequest body) { + requireBrandGatingAccess(request); + return ApiResponse.success(brandGatingService.add(body)); + } + + @DeleteMapping("/{id}") + @Operation(summary = "删除单条", description = "物理删除该行,返回实际删除数。") + public ApiResponse delete( + HttpServletRequest request, + @PathVariable("id") Long id) { + requireBrandGatingAccess(request); + return ApiResponse.success(brandGatingService.delete(id)); + } + + @PostMapping("/{id}/status") + @Operation(summary = "启用/停用", description = "status=1 恢复生效并清 disabled_at;status=0 停用并记 disabled_at=NOW();都刷 updated_at。") + public ApiResponse updateStatus( + HttpServletRequest request, + @PathVariable("id") Long id, + @Valid @RequestBody BrandGatingStatusRequest body) { + requireBrandGatingAccess(request); + return ApiResponse.success(brandGatingService.updateStatus(id, body.getStatus())); + } + + @PostMapping("/import") + @Operation(summary = "批量导入", description = "body 优先 { text }:按桌面版批量导入行格式解析(逗号/分号/制表符切列,# 注释行跳过);也兼容 { items } 直传。重复行跳过,返回 { added, skipped }。") + public ApiResponse importRows( + HttpServletRequest request, + @RequestBody BrandGatingImportRequest body) { + requireBrandGatingAccess(request); + return ApiResponse.success(brandGatingService.importRows(body)); + } + + /** 逐端点把门:登录态 + 后台菜单权限(admin_brand_gating)。 */ + private void requireBrandGatingAccess(HttpServletRequest request) { + AdminUserEntity operator = adminAuthSupport.requireUser(request); + permissionMenuService.requireConsolePageAccess(operator, DENIAL_MESSAGE, PERMISSION_KEY); + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/mapper/BrandGatingMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/mapper/BrandGatingMapper.java new file mode 100644 index 000000000..2fb1030c8 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/mapper/BrandGatingMapper.java @@ -0,0 +1,52 @@ +package com.nanri.aiimage.modules.brandgating.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingFilterQuery; +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingNameCountRow; +import com.nanri.aiimage.modules.brandgating.model.entity.BrandGatingEntity; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingRowVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 品牌Gating库(biz_brand_gating)数据访问。 + * + *

列表筛选/统计分组/启停这类动态 SQL 全部收口在本 Mapper 的 XML 里 + * ({@code mapper/brandgating/BrandGatingMapper.xml}),筛选值一律 {@code #{}} 占位符; + * 单条新增/删除走 MyBatis-Plus BaseMapper 既有能力。

+ */ +@Mapper +public interface BrandGatingMapper extends BaseMapper { + + /** 筛选命中总数。 */ + long countByFilter(@Param("f") BrandGatingFilterQuery filter); + + /** 当前页行:ORDER BY id DESC(对齐桌面版 list_gating)。 */ + List selectRows(@Param("f") BrandGatingFilterQuery filter); + + /** 全表行数。 */ + long countAll(); + + /** 按状态计数:1=生效、0=停用。 */ + long countByStatus(@Param("status") int status); + + /** 生效行里的去重品牌数。 */ + long countDistinctBrands(); + + /** 统计:按 Gating 类型分布(仅生效行)。 */ + List countGroupByType(); + + /** 统计:按国家分布(仅生效行,count DESC,对齐桌面版 by_country)。 */ + List countGroupByCountry(); + + /** 统计:按来源分布(仅生效行)。 */ + List countGroupBySource(); + + /** + * 启停(对齐桌面版 set_status_gating):status=1 清 disabled_at、=0 记 disabled_at=NOW(), + * 两种都刷 updated_at=NOW()。 + */ + int updateStatus(@Param("id") Long id, @Param("status") int status); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingAddRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingAddRequest.java new file mode 100644 index 000000000..bae98e029 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingAddRequest.java @@ -0,0 +1,22 @@ +package com.nanri.aiimage.modules.brandgating.model.dto; + +import lombok.Data; + +/** + * 品牌Gating库单条新增请求(POST /api/admin/brand-gating)。 + * + *

brand 必填(服务端校验,对齐桌面版 add_gating 的「品牌不能为空」); + * 其余字段可缺省,由服务端落桌面版同款默认:country→「全部」、gatingType→「品牌gating」、 + * asin/shopName→NULL、remark→空串、source→「MANUAL」。

+ */ +@Data +public class BrandGatingAddRequest { + + private String brand; + private String asin; + private String country; + private String gatingType; + private String source; + private String shopName; + private String remark; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingFilterQuery.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingFilterQuery.java new file mode 100644 index 000000000..5a7bac6dc --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingFilterQuery.java @@ -0,0 +1,29 @@ +package com.nanri.aiimage.modules.brandgating.model.dto; + +import lombok.Data; + +/** + * 品牌Gating库列表筛选载体(Mapper XML 的 #{f.xxx} 取值源)。 + * + *

筛选口径对齐桌面版 gating_web_admin.py list_gating(L138-156): + * keyword 模糊匹配 brand/asin,country/gatingType/source 精确等值(「全部」= 不限), + * status 精确等值(null = 不限)。分页偏移与容量由 Service 归一化后带入。

+ */ +@Data +public class BrandGatingFilterQuery { + + /** 品牌/ASIN 模糊搜索词(已 trim;空串 = 不限)。 */ + private String keyword; + /** 国家精确等值(空串或「全部」= 不限)。 */ + private String country; + /** Gating 类型精确等值(空串或「全部」= 不限)。 */ + private String gatingType; + /** 状态精确等值:1=生效 0=停用(null = 不限)。 */ + private Integer status; + /** 来源精确等值(空串或「全部」= 不限)。 */ + private String source; + /** 分页偏移((page-1)*size,已归一化)。 */ + private Long offset; + /** 每页条数(已归一化)。 */ + private Long limit; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingImportRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingImportRequest.java new file mode 100644 index 000000000..7ad009545 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingImportRequest.java @@ -0,0 +1,31 @@ +package com.nanri.aiimage.modules.brandgating.model.dto; + +import lombok.Data; + +import java.util.List; + +/** + * 品牌Gating库批量导入请求(POST /api/admin/brand-gating/import)。 + * + *

优先用 {@link #text}:原始粘贴文本整段交后端,按桌面版 parse_batch 的行格式解析 + * (中英文逗号/分号/制表符切列,字段序 品牌国家/类型/ASIN/备注,空行与 # 注释行跳过)。 + * 也兼容 {@link #items} 直传(text 为空时生效),每条按与单条新增同语义落库。

+ */ +@Data +public class BrandGatingImportRequest { + + /** 原始粘贴文本(桌面版批量导入文本框的整段内容)。 */ + private String text; + + /** 直传行(与 text 二选一,text 优先)。 */ + private List items; + + @Data + public static class Item { + private String brand; + private String country; + private String gatingType; + private String asin; + private String remark; + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingNameCountRow.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingNameCountRow.java new file mode 100644 index 000000000..a529ee7cc --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingNameCountRow.java @@ -0,0 +1,14 @@ +package com.nanri.aiimage.modules.brandgating.model.dto; + +import lombok.Data; + +/** + * 品牌Gating库统计分组单行(stats 的 byType/byCountry/bySource 共用)。 + * SQL 侧 {@code SELECT xxx AS name, COUNT(*) AS count} 直接映射。 + */ +@Data +public class BrandGatingNameCountRow { + + private String name; + private long count; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingStatusRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingStatusRequest.java new file mode 100644 index 000000000..538cf148c --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/dto/BrandGatingStatusRequest.java @@ -0,0 +1,15 @@ +package com.nanri.aiimage.modules.brandgating.model.dto; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * 品牌Gating库启停请求体(POST /api/admin/brand-gating/{id}/status)。 + * status:1=生效(清 disabled_at)、0=停用(记 disabled_at=NOW())。 + */ +@Data +public class BrandGatingStatusRequest { + + @NotNull(message = "status 不能为空") + private Integer status; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/entity/BrandGatingEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/entity/BrandGatingEntity.java new file mode 100644 index 000000000..fd7ea87a7 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/entity/BrandGatingEntity.java @@ -0,0 +1,35 @@ +package com.nanri.aiimage.modules.brandgating.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 品牌Gating库(biz_brand_gating)。 + * + *

表在主库(aiimage)早已存在——原先是独立小网页后台(gating_web_admin.py,直连同一库)在维护, + * 本次把它并入数富管理后台,桌面/网页与后台共用同一份数据。不建表、不走 Flyway: + * 本模块只做实体/Mapper 映射既有表。status:1=生效、0=停用(停用记 disabled_at,恢复清空)。

+ */ +@Data +@TableName("biz_brand_gating") +public class BrandGatingEntity { + + @TableId(type = IdType.AUTO) + private Long id; + private String brand; + private String asin; + private String country; + private String gatingType; + /** 1=生效 0=停用。 */ + private Integer status; + private String source; + private String shopName; + private String remark; + private LocalDateTime createdAt; + private LocalDateTime updatedAt; + private LocalDateTime disabledAt; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingAddResultVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingAddResultVo.java new file mode 100644 index 000000000..6c5ee5928 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingAddResultVo.java @@ -0,0 +1,10 @@ +package com.nanri.aiimage.modules.brandgating.model.vo; + +import lombok.Data; + +/** 单条新增结果:1=写入成功,0=命中唯一键重复被跳过(桌面版 add_gating 返回 False 的同语义)。 */ +@Data +public class BrandGatingAddResultVo { + + private int added; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingDeleteResultVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingDeleteResultVo.java new file mode 100644 index 000000000..6de5cee4a --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingDeleteResultVo.java @@ -0,0 +1,10 @@ +package com.nanri.aiimage.modules.brandgating.model.vo; + +import lombok.Data; + +/** 删除结果:实际删除的行数(0=该 id 不存在)。 */ +@Data +public class BrandGatingDeleteResultVo { + + private int deleted; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingImportResultVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingImportResultVo.java new file mode 100644 index 000000000..edc661aa1 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingImportResultVo.java @@ -0,0 +1,11 @@ +package com.nanri.aiimage.modules.brandgating.model.vo; + +import lombok.Data; + +/** 批量导入结果:added=实际写入行数,skipped=跳过行数(批内重复/命中唯一键重复/无效行)。 */ +@Data +public class BrandGatingImportResultVo { + + private int added; + private int skipped; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingPageVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingPageVo.java new file mode 100644 index 000000000..761f52b77 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingPageVo.java @@ -0,0 +1,13 @@ +package com.nanri.aiimage.modules.brandgating.model.vo; + +import lombok.Data; + +import java.util.List; + +/** 品牌Gating库分页负载(GET /api/admin/brand-gating → { total, rows })。 */ +@Data +public class BrandGatingPageVo { + + private long total; + private List rows; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingRowVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingRowVo.java new file mode 100644 index 000000000..d65e55d3e --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingRowVo.java @@ -0,0 +1,27 @@ +package com.nanri.aiimage.modules.brandgating.model.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 品牌Gating库列表单行(GET /api/admin/brand-gating 的 rows 元素)。 + * 字段与契约一一对应;时间字段原样透传(桌面版列表同列展示)。 + */ +@Data +public class BrandGatingRowVo { + + private Long id; + private String brand; + private String asin; + private String country; + private String gatingType; + /** 1=生效 0=停用。 */ + private Integer status; + private String source; + private String shopName; + private String remark; + private LocalDateTime createdAt; + private LocalDateTime updatedAt; + private LocalDateTime disabledAt; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingStatsVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingStatsVo.java new file mode 100644 index 000000000..5e1235627 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingStatsVo.java @@ -0,0 +1,30 @@ +package com.nanri.aiimage.modules.brandgating.model.vo; + +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingNameCountRow; +import lombok.Data; + +import java.util.List; + +/** + * 品牌Gating库统计负载(GET /api/admin/brand-gating/stats)。 + * 口径对齐桌面版 stats()(L165-178):active/disabled 按全表数,byType/byCountry/bySource + * 只数 status=1 的行,byCountry 按 count DESC。 + */ +@Data +public class BrandGatingStatsVo { + + /** 全表行数(含停用)。 */ + private long total; + /** 生效行数(status=1)。 */ + private long active; + /** 停用行数(status=0)。 */ + private long disabled; + /** 生效行里的去重品牌数。 */ + private long brands; + /** 按 Gating 类型分布(仅生效行)。 */ + private List byType; + /** 按国家分布(仅生效行,count DESC)。 */ + private List byCountry; + /** 按来源分布(仅生效行)。 */ + private List bySource; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingStatusResultVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingStatusResultVo.java new file mode 100644 index 000000000..8241ed35f --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/model/vo/BrandGatingStatusResultVo.java @@ -0,0 +1,10 @@ +package com.nanri.aiimage.modules.brandgating.model.vo; + +import lombok.Data; + +/** 启停结果:实际更新的行数(0=该 id 不存在)。 */ +@Data +public class BrandGatingStatusResultVo { + + private int updated; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/service/BrandGatingService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/service/BrandGatingService.java new file mode 100644 index 000000000..f60b47f8d --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brandgating/service/BrandGatingService.java @@ -0,0 +1,276 @@ +package com.nanri.aiimage.modules.brandgating.service; + +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.modules.brandgating.mapper.BrandGatingMapper; +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingAddRequest; +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingFilterQuery; +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingImportRequest; +import com.nanri.aiimage.modules.brandgating.model.entity.BrandGatingEntity; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingAddResultVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingDeleteResultVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingImportResultVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingPageVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingRowVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingStatsVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingStatusResultVo; +import lombok.RequiredArgsConstructor; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * 品牌Gating库(biz_brand_gating)业务:独立小网页后台(gating_web_admin.py)并入数富管理后台。 + * + *

行为口径逐条对齐桌面版(直连同一 aiimage 库,两端共用同一份数据): + * 列表筛选/统计见 {@code list_gating}/`stats`(L138-178),新增默认值见 {@code add_gating} + * (L181-193:asin/shop_name 空→NULL、country 空→「全部」、gating_type 空→「品牌gating」、 + * source 固定「MANUAL」、remark 空→空串,created_at/updated_at 由库默认维护、INSERT 不显式写), + * 启停见 {@code set_status_gating}(L196-201),批量导入见 {@code parse_batch}/{@code batch_add} + * (L208-237)。重复判定沿用桌面版的唯一键兜底:INSERT 撞唯一键即跳过。

+ */ +@Service +@RequiredArgsConstructor +public class BrandGatingService { + + /** 手动新增行的固定来源(桌面版 add_gating/batch_add 同口径)。 */ + public static final String SOURCE_MANUAL = "MANUAL"; + /** 缺省国家(桌面版默认值,也是表内真实取值)。 */ + public static final String DEFAULT_COUNTRY = "全部"; + /** 缺省 Gating 类型。 */ + public static final String DEFAULT_GATING_TYPE = "品牌gating"; + + /** 列表默认页容量(对齐桌面版 page_size=10)。 */ + public static final long DEFAULT_PAGE_SIZE = 10; + /** 列表页容量上限(防御性截断,前端档位 10/20/50)。 */ + public static final long MAX_PAGE_SIZE = 200; + + /** 批量导入的去重维度:同 品牌+国家+类型+ASIN 的行只写第一条(批内重复跳过)。 */ + private static final String IMPORT_DEDUP_KEY_FORMAT = "%s\n%s\n%s\n%s"; + + private final BrandGatingMapper brandGatingMapper; + + // ---------------------------------------------------------------- 列表与统计 + + public BrandGatingPageVo page(Long page, Long size, String keyword, String country, + String gatingType, String status, String source) { + BrandGatingFilterQuery filter = new BrandGatingFilterQuery(); + filter.setKeyword(trimToEmpty(keyword)); + filter.setCountry(trimToEmpty(country)); + filter.setGatingType(trimToEmpty(gatingType)); + filter.setStatus(parseStatusFilter(status)); + filter.setSource(trimToEmpty(source)); + long pageSize = normalizePageSize(size); + filter.setLimit(pageSize); + filter.setOffset((normalizePage(page) - 1) * pageSize); + + BrandGatingPageVo vo = new BrandGatingPageVo(); + vo.setTotal(brandGatingMapper.countByFilter(filter)); + List rows = brandGatingMapper.selectRows(filter); + vo.setRows(rows); + return vo; + } + + public BrandGatingStatsVo stats() { + BrandGatingStatsVo vo = new BrandGatingStatsVo(); + vo.setTotal(brandGatingMapper.countAll()); + vo.setActive(brandGatingMapper.countByStatus(1)); + vo.setDisabled(brandGatingMapper.countByStatus(0)); + vo.setBrands(brandGatingMapper.countDistinctBrands()); + vo.setByType(brandGatingMapper.countGroupByType()); + vo.setByCountry(brandGatingMapper.countGroupByCountry()); + vo.setBySource(brandGatingMapper.countGroupBySource()); + return vo; + } + + // ---------------------------------------------------------------- 单条操作 + + public BrandGatingAddResultVo add(BrandGatingAddRequest request) { + BrandGatingAddResultVo vo = new BrandGatingAddResultVo(); + String brand = trimToEmpty(request.getBrand()); + if (brand.isEmpty()) { + throw new BusinessException(400, "品牌不能为空"); + } + BrandGatingEntity entity = new BrandGatingEntity(); + entity.setBrand(brand); + applyOptionalDefaults(entity, request.getAsin(), request.getCountry(), + request.getGatingType(), request.getRemark()); + entity.setSource(firstNonBlank(request.getSource(), SOURCE_MANUAL)); + entity.setShopName(trimToNull(request.getShopName())); + // 撞唯一键 = 已存在同口径行:桌面版 add_gating 捕 IntegrityError 返回 False,这里同语义回 0 + try { + brandGatingMapper.insert(entity); + vo.setAdded(1); + } catch (DuplicateKeyException ex) { + vo.setAdded(0); + } + return vo; + } + + public BrandGatingDeleteResultVo delete(Long id) { + BrandGatingDeleteResultVo vo = new BrandGatingDeleteResultVo(); + vo.setDeleted(brandGatingMapper.deleteById(id)); + return vo; + } + + public BrandGatingStatusResultVo updateStatus(Long id, Integer status) { + if (status == null || (status != 0 && status != 1)) { + throw new BusinessException(400, "status 只能为 0(停用)或 1(生效)"); + } + BrandGatingStatusResultVo vo = new BrandGatingStatusResultVo(); + vo.setUpdated(brandGatingMapper.updateStatus(id, status)); + return vo; + } + + // ---------------------------------------------------------------- 批量导入 + + public BrandGatingImportResultVo importRows(BrandGatingImportRequest request) { + List items = resolveImportItems(request); + BrandGatingImportResultVo vo = new BrandGatingImportResultVo(); + Set seen = new HashSet<>(); + for (BrandGatingImportRequest.Item item : items) { + String brand = trimToEmpty(item.getBrand()); + String country = firstNonBlank(item.getCountry(), DEFAULT_COUNTRY); + String gatingType = firstNonBlank(item.getGatingType(), DEFAULT_GATING_TYPE); + String asin = trimToEmpty(item.getAsin()); + if (brand.isEmpty()) { + // 文本解析路径不会产出空品牌(空段被丢弃),items 直传路径在这里拦下 + vo.setSkipped(vo.getSkipped() + 1); + continue; + } + String dedupKey = String.format(IMPORT_DEDUP_KEY_FORMAT, brand, country, gatingType, asin); + if (!seen.add(dedupKey)) { + vo.setSkipped(vo.getSkipped() + 1); + continue; + } + BrandGatingEntity entity = new BrandGatingEntity(); + entity.setBrand(brand); + entity.setAsin(asin.isEmpty() ? null : asin); + entity.setCountry(country); + entity.setGatingType(gatingType); + entity.setSource(SOURCE_MANUAL); + entity.setShopName(null); + entity.setRemark(item.getRemark() == null ? "" : item.getRemark().strip()); + // 撞唯一键 = 库里已有同口径行(桌面版 batch_add 捕 IntegrityError 计 skipped 的同语义) + try { + brandGatingMapper.insert(entity); + vo.setAdded(vo.getAdded() + 1); + } catch (DuplicateKeyException ex) { + vo.setSkipped(vo.getSkipped() + 1); + } + } + return vo; + } + + /** text 优先(照桌面版行格式解析),text 为空回退 items 直传;两者都缺 → 400。 */ + private List resolveImportItems(BrandGatingImportRequest request) { + if (request == null) { + throw new BusinessException(400, "导入内容为空"); + } + if (request.getText() != null && !request.getText().isBlank()) { + return parseBatchText(request.getText()); + } + if (request.getItems() != null && !request.getItems().isEmpty()) { + return request.getItems(); + } + throw new BusinessException(400, "导入内容为空"); + } + + /** + * 桌面版 parse_batch(gating_web_admin.py L208-223)的逐行移植: + *
    + *
  • 按行拆分;每行去首尾空白与 BOM(\uFEFF);
  • + *
  • 空行与 # 开头的注释行跳过;
  • + *
  • 行内按中英文逗号/分号/制表符([,\t;,;])切分,各段去空白后丢掉空段;
  • + *
  • 字段序:品牌、国家(缺省「全部」)、Gating类型(缺省「品牌gating」)、ASIN(缺省空)、 + * 备注(缺省空);第 5 列之后的段照桌面版丢弃。
  • + *
+ */ + public static List parseBatchText(String text) { + List out = new ArrayList<>(); + if (text == null || text.isBlank()) { + return out; + } + for (String rawLine : text.split("\\R")) { + String line = rawLine.strip(); + if (line.startsWith("\uFEFF")) { + line = line.substring(1).strip(); + } + if (line.isEmpty() || line.startsWith("#")) { + continue; + } + List parts = Arrays.stream(line.split("[,\\t;,;]")) + .map(String::strip) + .filter(part -> !part.isEmpty()) + .toList(); + if (parts.isEmpty()) { + continue; + } + BrandGatingImportRequest.Item item = new BrandGatingImportRequest.Item(); + item.setBrand(parts.get(0)); + item.setCountry(parts.size() > 1 ? parts.get(1) : DEFAULT_COUNTRY); + item.setGatingType(parts.size() > 2 ? parts.get(2) : DEFAULT_GATING_TYPE); + item.setAsin(parts.size() > 3 ? parts.get(3) : ""); + item.setRemark(parts.size() > 4 ? parts.get(4) : ""); + out.add(item); + } + return out; + } + + // ---------------------------------------------------------------- 私有工具 + + /** 桌面版 add/batch_add 的可选字段默认值:asin/shop_name 空→NULL、country/gating_type 空→默认、remark 空→空串。 */ + private void applyOptionalDefaults(BrandGatingEntity entity, String asin, String country, + String gatingType, String remark) { + entity.setAsin(trimToNull(asin)); + entity.setCountry(firstNonBlank(country, DEFAULT_COUNTRY)); + entity.setGatingType(firstNonBlank(gatingType, DEFAULT_GATING_TYPE)); + entity.setRemark(remark == null ? "" : remark.strip()); + } + + private static String trimToEmpty(String value) { + return value == null ? "" : value.strip(); + } + + private static String trimToNull(String value) { + if (value == null) { + return null; + } + String trimmed = value.strip(); + return trimmed.isEmpty() ? null : trimmed; + } + + private static String firstNonBlank(String value, String fallback) { + String trimmed = trimToNull(value); + return trimmed == null ? fallback : trimmed; + } + + /** "1"→1、"0"→0,其余(含空串与「全部」)→ null = 不限。 */ + private static Integer parseStatusFilter(String status) { + if ("1".equals(status)) { + return 1; + } + if ("0".equals(status)) { + return 0; + } + return null; + } + + private static long normalizePage(Long page) { + if (page == null || page < 1) { + return 1; + } + return page; + } + + private static long normalizePageSize(Long size) { + if (size == null || size < 1) { + return DEFAULT_PAGE_SIZE; + } + return Math.min(size, MAX_PAGE_SIZE); + } +} diff --git a/backend-java/src/main/resources/mapper/brandgating/BrandGatingMapper.xml b/backend-java/src/main/resources/mapper/brandgating/BrandGatingMapper.xml new file mode 100644 index 000000000..844e3270d --- /dev/null +++ b/backend-java/src/main/resources/mapper/brandgating/BrandGatingMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + AND (brand LIKE CONCAT('%', #{f.keyword}, '%') OR asin LIKE CONCAT('%', #{f.keyword}, '%')) + + AND country = #{f.country} + AND gating_type = #{f.gatingType} + AND status = #{f.status} + AND source = #{f.source} + + + + + + + + + + + + + + + + + + + + + UPDATE biz_brand_gating + SET status = #{status}, + disabled_at = IF(#{status} = 1, NULL, NOW()), + updated_at = NOW() + WHERE id = #{id} + + diff --git a/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java b/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java index 3a765995e..d650bbbe4 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java @@ -56,9 +56,10 @@ class MigratedSqlEquivalenceTest { private static final int LEDGER_SELECTS = 60; /** 全部 mapper XML 里的 select 总数:账本 60 + TaskImageCache 5 + AsinResultCache 1。 */ /** 66 → 67:会话容忍新增的 {@code AdminUserMapper#countLiveWorkFor} 也是一条 select。 */ - // 67 → 78:keywordshare 模块新写 11 条 select,逐条登记进下方 NOT_MIGRATED - // (与 SqlLayeringConventionTest.XML_STATEMENT_TOTAL 同轮 99 → 115)。 - private static final int XML_SELECT_TOTAL = 78; + // 67 → 78:keywordshare 模块新写 11 条 select,逐条登记进下方 NOT_MIGRATED。 + // 78 → 86:brandgating 模块新写 8 条 select,同样逐条点入 + // (与 SqlLayeringConventionTest.XML_STATEMENT_TOTAL 同轮 99 → 115 → 124)。 + private static final int XML_SELECT_TOTAL = 86; /** * 不是「从注解搬过来」的语句:注解时代没有原文可对撞,等价性这支只能跳过它们。 @@ -82,7 +83,16 @@ class MigratedSqlEquivalenceTest { "KeywordShareMapper#selectCategoryCounts", "KeywordShareMapper#selectSubCategoryCounts", "KeywordShareMapper#selectCategoryL3Counts", - "KeywordShareMapper#selectExistingKeywords"); + "KeywordShareMapper#selectExistingKeywords", + // brandgating 模块(品牌Gating库并入管理后台,2026-10-23)新写 8 条 select。 + "BrandGatingMapper#countByFilter", + "BrandGatingMapper#selectRows", + "BrandGatingMapper#countAll", + "BrandGatingMapper#countByStatus", + "BrandGatingMapper#countDistinctBrands", + "BrandGatingMapper#countGroupByType", + "BrandGatingMapper#countGroupByCountry", + "BrandGatingMapper#countGroupBySource"); /** 账本 5 列:接口 / 方法 / @Select 种类 / 是否含常量插值 / 注解原文(Java 反转义后那条串)。 */ private static final int LEDGER_COLUMNS = 5; diff --git a/backend-java/src/test/java/com/nanri/aiimage/SqlLayeringConventionTest.java b/backend-java/src/test/java/com/nanri/aiimage/SqlLayeringConventionTest.java index 8e0cb5ccf..5ec9e62be 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/SqlLayeringConventionTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/SqlLayeringConventionTest.java @@ -72,9 +72,10 @@ class SqlLayeringConventionTest { // 计次发生在发请求之前(含重试),token 只有响应回来才有读数,合成一条 upsert 就会漏计超时的那次。 // 98 → 99:失败任务重试新增 {@code CollectDataItemMapper#copyItemsForRetry} // (INSERT ... SELECT 复制明细行),同样登记进 NOT_MIGRATED。 - // 99 → 115:keywordshare 模块(五国关键词共享网页化,5 份 XML 16 条)新写语句, - // 11 条 select 逐条登记进 MigratedSqlEquivalenceTest.NOT_MIGRATED(与本格同轮 67 → 78)。 - private static final int XML_STATEMENT_TOTAL = 115; + // 99 → 115:keywordshare 模块(五国关键词共享网页化,5 份 XML 16 条)新写语句。 + // 115 → 124:brandgating 模块(品牌Gating库并入管理后台,1 份 XML 9 条)新写语句; + // 两批 19 条 select 逐条登记进 MigratedSqlEquivalenceTest.NOT_MIGRATED(67 → 78 → 86)。 + private static final int XML_STATEMENT_TOTAL = 124; /** * wrapper 里夹带函数级 SQL 的现状("这不是简单单表"的证据),文件名 → 条数: diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/brandgating/service/BrandGatingServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/brandgating/service/BrandGatingServiceTest.java new file mode 100644 index 000000000..e65ca44bb --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/brandgating/service/BrandGatingServiceTest.java @@ -0,0 +1,479 @@ +package com.nanri.aiimage.modules.brandgating.service; + +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.modules.brandgating.mapper.BrandGatingMapper; +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingAddRequest; +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingFilterQuery; +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingImportRequest; +import com.nanri.aiimage.modules.brandgating.model.dto.BrandGatingNameCountRow; +import com.nanri.aiimage.modules.brandgating.model.entity.BrandGatingEntity; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingImportResultVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingPageVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingRowVo; +import com.nanri.aiimage.modules.brandgating.model.vo.BrandGatingStatsVo; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.dao.DuplicateKeyException; + +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.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * 品牌Gating库 Service 单测:列表筛选/分页归一化、stats 三组分组、新增默认值与唯一键跳过、 + * 启停(disabled_at 语义由 XML 契约钉住)、删除、批量导入(照桌面版行格式:正常行/缺字段行/重复行)。 + * 另以源码契约测试把 Mapper XML 与控制器的权限键把门钉住。 + */ +@ExtendWith(MockitoExtension.class) +class BrandGatingServiceTest { + + @Mock + private BrandGatingMapper brandGatingMapper; + + private BrandGatingService newService() { + return new BrandGatingService(brandGatingMapper); + } + + private static BrandGatingRowVo row(long id, String brand) { + BrandGatingRowVo vo = new BrandGatingRowVo(); + vo.setId(id); + vo.setBrand(brand); + vo.setStatus(1); + return vo; + } + + private static BrandGatingImportRequest.Item item(String brand, String country, String gatingType, + String asin, String remark) { + BrandGatingImportRequest.Item item = new BrandGatingImportRequest.Item(); + item.setBrand(brand); + item.setCountry(country); + item.setGatingType(gatingType); + item.setAsin(asin); + item.setRemark(remark); + return item; + } + + // ---------------------------------------------------------------- 列表 + + @Test + @DisplayName("列表:筛选条件与分页进 Mapper 载体,page/size 归一化(page<1→1、size 缺省 10、上限 200)") + void pageCarriesFilterAndNormalizedPaging() { + when(brandGatingMapper.countByFilter(any(BrandGatingFilterQuery.class))).thenReturn(0L); + when(brandGatingMapper.selectRows(any(BrandGatingFilterQuery.class))).thenReturn(List.of()); + + newService().page(0L, 1000L, " Anker ", " 英国 ", "品牌gating", "1", "AUTO"); + + ArgumentCaptor captor = ArgumentCaptor.forClass(BrandGatingFilterQuery.class); + verify(brandGatingMapper).selectRows(captor.capture()); + BrandGatingFilterQuery filter = captor.getValue(); + assertThat(filter.getKeyword()).isEqualTo("Anker"); + assertThat(filter.getCountry()).isEqualTo("英国"); + assertThat(filter.getGatingType()).isEqualTo("品牌gating"); + assertThat(filter.getStatus()).isEqualTo(1); + assertThat(filter.getSource()).isEqualTo("AUTO"); + // page=0→1、size=1000→200(上限截断) + assertThat(filter.getOffset()).isZero(); + assertThat(filter.getLimit()).isEqualTo(200L); + } + + @Test + @DisplayName("列表:缺省分页 = 桌面版口径(page 1、size 10);status 非 0/1(含「全部」)→ 不限") + void pageDefaultsFollowDesktop() { + when(brandGatingMapper.countByFilter(any(BrandGatingFilterQuery.class))).thenReturn(0L); + when(brandGatingMapper.selectRows(any(BrandGatingFilterQuery.class))).thenReturn(List.of()); + + newService().page(null, null, null, "全部", null, "全部", null); + + ArgumentCaptor captor = ArgumentCaptor.forClass(BrandGatingFilterQuery.class); + verify(brandGatingMapper).selectRows(captor.capture()); + assertThat(captor.getValue().getOffset()).isZero(); + assertThat(captor.getValue().getLimit()).isEqualTo(10L); + assertThat(captor.getValue().getStatus()).isNull(); + } + + @Test + @DisplayName("列表:total 取同条件命中数,行按 Mapper 返回顺序透传(SQL 侧已 ORDER BY id DESC)") + void pageReturnsTotalAndRows() { + when(brandGatingMapper.countByFilter(any(BrandGatingFilterQuery.class))).thenReturn(42L); + when(brandGatingMapper.selectRows(any(BrandGatingFilterQuery.class))).thenReturn(List.of(row(9, "B"), row(3, "A"))); + + BrandGatingPageVo vo = newService().page(2L, 10L, null, null, null, null, null); + + assertThat(vo.getTotal()).isEqualTo(42L); + assertThat(vo.getRows()).extracting(BrandGatingRowVo::getId).containsExactly(9L, 3L); + } + + @ParameterizedTest + @ValueSource(strings = {"2", "生效", "abc"}) + @DisplayName("列表:status 非法值一律按不限处理(桌面版下拉只有 生效/停用/全部)") + void pageTreatsIllegalStatusAsNoFilter(String status) { + when(brandGatingMapper.countByFilter(any(BrandGatingFilterQuery.class))).thenReturn(0L); + when(brandGatingMapper.selectRows(any(BrandGatingFilterQuery.class))).thenReturn(List.of()); + + newService().page(1L, 10L, null, null, null, status, null); + + verify(brandGatingMapper).selectRows(any(BrandGatingFilterQuery.class)); + ArgumentCaptor captor = ArgumentCaptor.forClass(BrandGatingFilterQuery.class); + verify(brandGatingMapper).selectRows(captor.capture()); + assertThat(captor.getValue().getStatus()).isNull(); + } + + // ---------------------------------------------------------------- 统计 + + @Test + @DisplayName("stats:total/active/disabled/brands 与 byType/byCountry/bySource 三组分组透传") + void statsAggregatesAllGroups() { + when(brandGatingMapper.countAll()).thenReturn(100L); + when(brandGatingMapper.countByStatus(1)).thenReturn(80L); + when(brandGatingMapper.countByStatus(0)).thenReturn(20L); + when(brandGatingMapper.countDistinctBrands()).thenReturn(31L); + BrandGatingNameCountRow typeRow = new BrandGatingNameCountRow(); + typeRow.setName("品牌gating"); + typeRow.setCount(60); + BrandGatingNameCountRow countryRow = new BrandGatingNameCountRow(); + countryRow.setName("英国"); + countryRow.setCount(50); + BrandGatingNameCountRow sourceRow = new BrandGatingNameCountRow(); + sourceRow.setName("MANUAL"); + sourceRow.setCount(30); + when(brandGatingMapper.countGroupByType()).thenReturn(List.of(typeRow)); + when(brandGatingMapper.countGroupByCountry()).thenReturn(List.of(countryRow)); + when(brandGatingMapper.countGroupBySource()).thenReturn(List.of(sourceRow)); + + BrandGatingStatsVo vo = newService().stats(); + + assertThat(vo.getTotal()).isEqualTo(100L); + assertThat(vo.getActive()).isEqualTo(80L); + assertThat(vo.getDisabled()).isEqualTo(20L); + assertThat(vo.getBrands()).isEqualTo(31L); + assertThat(vo.getByType()).extracting(BrandGatingNameCountRow::getName).containsExactly("品牌gating"); + assertThat(vo.getByCountry()).extracting(BrandGatingNameCountRow::getName).containsExactly("英国"); + assertThat(vo.getBySource()).extracting(BrandGatingNameCountRow::getName).containsExactly("MANUAL"); + // 桌面版口径:分组计数各查一遍,且 active/disabled 分别按 1/0 数 + verify(brandGatingMapper).countByStatus(1); + verify(brandGatingMapper).countByStatus(0); + } + + // ---------------------------------------------------------------- 新增 + + @Test + @DisplayName("新增:缺省字段落桌面版同款默认(asin/shopName→NULL、country=全部、type=品牌gating、source=MANUAL、remark=空串)") + void addAppliesDesktopDefaults() { + BrandGatingAddRequest request = new BrandGatingAddRequest(); + request.setBrand(" Anker "); + + var result = newService().add(request); + + assertThat(result.getAdded()).isEqualTo(1); + ArgumentCaptor captor = ArgumentCaptor.forClass(BrandGatingEntity.class); + verify(brandGatingMapper).insert(captor.capture()); + BrandGatingEntity entity = captor.getValue(); + assertThat(entity.getBrand()).isEqualTo("Anker"); + assertThat(entity.getAsin()).isNull(); + assertThat(entity.getShopName()).isNull(); + assertThat(entity.getCountry()).isEqualTo("全部"); + assertThat(entity.getGatingType()).isEqualTo("品牌gating"); + assertThat(entity.getSource()).isEqualTo("MANUAL"); + assertThat(entity.getRemark()).isEmpty(); + // created_at/updated_at 由库默认维护:INSERT 不显式写时间 + assertThat(entity.getCreatedAt()).isNull(); + assertThat(entity.getUpdatedAt()).isNull(); + } + + @Test + @DisplayName("新增:请求显式给 source/shopName/asin 时按请求值落库") + void addKeepsExplicitFields() { + BrandGatingAddRequest request = new BrandGatingAddRequest(); + request.setBrand("Anker"); + request.setAsin("B0ABCDEFG"); + request.setCountry("德国"); + request.setGatingType("类目gating"); + request.setSource("AUTO"); + request.setShopName("店铺A"); + request.setRemark("备注"); + + newService().add(request); + + ArgumentCaptor captor = ArgumentCaptor.forClass(BrandGatingEntity.class); + verify(brandGatingMapper).insert(captor.capture()); + assertThat(captor.getValue().getAsin()).isEqualTo("B0ABCDEFG"); + assertThat(captor.getValue().getCountry()).isEqualTo("德国"); + assertThat(captor.getValue().getGatingType()).isEqualTo("类目gating"); + assertThat(captor.getValue().getSource()).isEqualTo("AUTO"); + assertThat(captor.getValue().getShopName()).isEqualTo("店铺A"); + assertThat(captor.getValue().getRemark()).isEqualTo("备注"); + } + + @Test + @DisplayName("新增:品牌为空(含纯空白)→ 400「品牌不能为空」,不动库") + void addRejectsBlankBrand() { + BrandGatingAddRequest request = new BrandGatingAddRequest(); + request.setBrand(" "); + + assertThatThrownBy(() -> newService().add(request)) + .isInstanceOf(BusinessException.class) + .hasMessageContaining("品牌不能为空") + .extracting(e -> ((BusinessException) e).getCode()) + .isEqualTo(400); + verify(brandGatingMapper, never()).insert(any(BrandGatingEntity.class)); + } + + @Test + @DisplayName("新增:撞唯一键(已存在同口径行)→ added=0,不抛错(桌面版 add_gating 返回 False 的同语义)") + void addReturnsZeroOnDuplicate() { + BrandGatingAddRequest request = new BrandGatingAddRequest(); + request.setBrand("Anker"); + when(brandGatingMapper.insert(any(BrandGatingEntity.class))) + .thenThrow(new DuplicateKeyException("dup")); + + var result = newService().add(request); + + assertThat(result.getAdded()).isZero(); + } + + // ---------------------------------------------------------------- 启停 / 删除 + + @Test + @DisplayName("启停:status 0/1 透传 Mapper(disabled_at 语义由 XML 契约钉住),返回实际更新数") + void updateStatusDelegatesToMapper() { + when(brandGatingMapper.updateStatus(7L, 0)).thenReturn(1); + when(brandGatingMapper.updateStatus(8L, 1)).thenReturn(0); + + assertThat(newService().updateStatus(7L, 0).getUpdated()).isEqualTo(1); + assertThat(newService().updateStatus(8L, 1).getUpdated()).isZero(); + + verify(brandGatingMapper).updateStatus(7L, 0); + verify(brandGatingMapper).updateStatus(8L, 1); + } + + @Test + @DisplayName("启停:status 非 0/1 → 400,不动库") + void updateStatusRejectsIllegalValue() { + assertThatThrownBy(() -> newService().updateStatus(7L, 2)) + .isInstanceOf(BusinessException.class) + .hasMessageContaining("status"); + assertThatThrownBy(() -> newService().updateStatus(7L, null)) + .isInstanceOf(BusinessException.class); + verify(brandGatingMapper, never()).updateStatus(any(), eq(2)); + } + + @Test + @DisplayName("删除:透传 Mapper,返回实际删除数(0=该 id 不存在)") + void deleteReturnsAffectedRows() { + when(brandGatingMapper.deleteById(7L)).thenReturn(1); + when(brandGatingMapper.deleteById(99L)).thenReturn(0); + + assertThat(newService().delete(7L).getDeleted()).isEqualTo(1); + assertThat(newService().delete(99L).getDeleted()).isZero(); + } + + // ---------------------------------------------------------------- 批量导入:文本解析(照桌面版 parse_batch) + + @Test + @DisplayName("导入解析:正常行全字段按 品牌/国家/类型/ASIN/备注 切列") + void parseBatchTextKeepsAllFiveFields() { + List items = + BrandGatingService.parseBatchText("Anker,英国,品牌gating,B0ABCDEFG,跟卖重灾区"); + + assertThat(items).hasSize(1); + assertThat(items.get(0).getBrand()).isEqualTo("Anker"); + assertThat(items.get(0).getCountry()).isEqualTo("英国"); + assertThat(items.get(0).getGatingType()).isEqualTo("品牌gating"); + assertThat(items.get(0).getAsin()).isEqualTo("B0ABCDEFG"); + assertThat(items.get(0).getRemark()).isEqualTo("跟卖重灾区"); + } + + @Test + @DisplayName("导入解析:缺字段行落桌面版默认(国家=全部、类型=品牌gating、ASIN/备注空),空段丢弃、第 5 列之后丢弃") + void parseBatchTextAppliesDefaultsAndDropsExtraColumns() { + List items = BrandGatingService.parseBatchText( + "Anker\nAnker2,德国\nAnker3,法国,类目gating\n" + + "Anker4,西班牙,类目gating,B09ZZZZZZZ,多余列1,多余列2\n" + + "Anker5,,英国"); + + assertThat(items).hasSize(5); + assertThat(items.get(0).getCountry()).isEqualTo("全部"); + assertThat(items.get(0).getGatingType()).isEqualTo("品牌gating"); + assertThat(items.get(0).getAsin()).isEmpty(); + assertThat(items.get(1).getCountry()).isEqualTo("德国"); + assertThat(items.get(1).getGatingType()).isEqualTo("品牌gating"); + assertThat(items.get(2).getGatingType()).isEqualTo("类目gating"); + assertThat(items.get(2).getAsin()).isEmpty(); + assertThat(items.get(3).getCountry()).isEqualTo("西班牙"); + assertThat(items.get(3).getGatingType()).isEqualTo("类目gating"); + assertThat(items.get(3).getAsin()).isEqualTo("B09ZZZZZZZ"); + assertThat(items.get(3).getRemark()).isEqualTo("多余列1"); + // 空段被丢弃(桌面版 filter p.strip() 同口径):Anker5 行的 ASIN 位空掉后,英国顶上来当国家 + assertThat(items.get(4).getCountry()).isEqualTo("英国"); + assertThat(items.get(4).getGatingType()).isEqualTo("品牌gating"); + } + + @Test + @DisplayName("导入解析:中英文逗号/分号/制表符都切列,各段去空白、空段丢弃;BOM 与 # 注释行/空行跳过") + void parseBatchTextSplitsOnAllSeparatorsAndSkipsNoiseLines() { + String text = "\uFEFFAnker\t英国;品牌gating\n" + + "# 注释行\n" + + " \n" + + " Anker2 , 德国 ,类目gating, B0X ,备注带空格 \n" + + ",,,\n"; + + List items = BrandGatingService.parseBatchText(text); + + assertThat(items).hasSize(2); + assertThat(items.get(0).getBrand()).isEqualTo("Anker"); + assertThat(items.get(0).getCountry()).isEqualTo("英国"); + assertThat(items.get(0).getGatingType()).isEqualTo("品牌gating"); + assertThat(items.get(1).getBrand()).isEqualTo("Anker2"); + assertThat(items.get(1).getCountry()).isEqualTo("德国"); + assertThat(items.get(1).getGatingType()).isEqualTo("类目gating"); + assertThat(items.get(1).getAsin()).isEqualTo("B0X"); + assertThat(items.get(1).getRemark()).isEqualTo("备注带空格"); + } + + @Test + @DisplayName("导入解析:null/空文本 → 空清单") + void parseBatchTextHandlesBlankInput() { + assertThat(BrandGatingService.parseBatchText(null)).isEmpty(); + assertThat(BrandGatingService.parseBatchText(" \n # x")).isEmpty(); + } + + // ---------------------------------------------------------------- 批量导入:写库与去重 + + @Test + @DisplayName("导入写库:逐条按单条新增同语义落库(source=MANUAL、shopName=NULL、缺省字段落默认)") + void importWritesRowsWithSameSemanticsAsAdd() { + BrandGatingImportRequest request = new BrandGatingImportRequest(); + request.setText("Anker,英国\nAnker2,德国,类目gating,B09ZZZZZZZ,备注"); + + BrandGatingImportResultVo result = newService().importRows(request); + + assertThat(result.getAdded()).isEqualTo(2); + assertThat(result.getSkipped()).isZero(); + ArgumentCaptor captor = ArgumentCaptor.forClass(BrandGatingEntity.class); + verify(brandGatingMapper, times(2)).insert(captor.capture()); + List rows = captor.getAllValues(); + assertThat(rows.get(0).getBrand()).isEqualTo("Anker"); + assertThat(rows.get(0).getCountry()).isEqualTo("英国"); + assertThat(rows.get(0).getGatingType()).isEqualTo("品牌gating"); + assertThat(rows.get(0).getAsin()).isNull(); + assertThat(rows.get(0).getSource()).isEqualTo("MANUAL"); + assertThat(rows.get(0).getShopName()).isNull(); + assertThat(rows.get(1).getRemark()).isEqualTo("备注"); + } + + @Test + @DisplayName("导入去重:批内重复行(同品牌+国家+类型+ASIN)只写第一条,其余计入 skipped") + void importSkipsInBatchDuplicates() { + BrandGatingImportRequest request = new BrandGatingImportRequest(); + request.setText("Anker,英国\nAnker,英国\nAnker,英国,品牌gating,B0X\nAnker,英国,品牌gating,B0X\nAnker,德国"); + + BrandGatingImportResultVo result = newService().importRows(request); + + assertThat(result.getAdded()).isEqualTo(3); + assertThat(result.getSkipped()).isEqualTo(2); + verify(brandGatingMapper, times(3)).insert(any(BrandGatingEntity.class)); + } + + @Test + @DisplayName("导入去重:撞库内唯一键(已存在同口径行)计入 skipped,不中断后续行") + void importSkipsDbDuplicatesAndContinues() { + BrandGatingImportRequest request = new BrandGatingImportRequest(); + request.setText("Anker,英国\nAnker2,德国"); + when(brandGatingMapper.insert(any(BrandGatingEntity.class))) + .thenThrow(new DuplicateKeyException("dup")) + .thenReturn(1); + + BrandGatingImportResultVo result = newService().importRows(request); + + assertThat(result.getAdded()).isEqualTo(1); + assertThat(result.getSkipped()).isEqualTo(1); + } + + @Test + @DisplayName("导入 items 直传:缺省字段同语义落默认,空品牌行跳过") + void importAcceptsDirectItems() { + BrandGatingImportRequest request = new BrandGatingImportRequest(); + request.setItems(List.of( + item("Anker", "英国", null, "B0X", null), + item(" ", "德国", null, null, null))); + + BrandGatingImportResultVo result = newService().importRows(request); + + assertThat(result.getAdded()).isEqualTo(1); + assertThat(result.getSkipped()).isEqualTo(1); + ArgumentCaptor captor = ArgumentCaptor.forClass(BrandGatingEntity.class); + verify(brandGatingMapper).insert(captor.capture()); + assertThat(captor.getValue().getGatingType()).isEqualTo("品牌gating"); + assertThat(captor.getValue().getRemark()).isEmpty(); + } + + @Test + @DisplayName("导入:text 优先于 items;两者都缺 → 400「导入内容为空」,不动库") + void importPrefersTextAndRejectsEmptyPayload() { + BrandGatingImportRequest both = new BrandGatingImportRequest(); + both.setText("Anker,英国"); + both.setItems(List.of(item("Anker2", "德国", null, null, null))); + assertThat(newService().importRows(both).getAdded()).isEqualTo(1); + verify(brandGatingMapper, times(1)).insert(any(BrandGatingEntity.class)); + + assertThatThrownBy(() -> newService().importRows(new BrandGatingImportRequest())) + .isInstanceOf(BusinessException.class) + .hasMessageContaining("导入内容为空"); + assertThatThrownBy(() -> newService().importRows(null)) + .isInstanceOf(BusinessException.class); + verify(brandGatingMapper, times(1)).insert(any(BrandGatingEntity.class)); + } + + // ---------------------------------------------------------------- 契约钉子(SQL / 权限键) + + @Test + @DisplayName("Mapper XML 契约:ORDER BY id DESC、#{} 占位符禁 ${}、启停的 disabled_at/updated_at 语义、统计分组只数生效行且国家按 count DESC") + void mapperXmlKeepsSqlContract() throws Exception { + String xml = Files.readString( + Path.of("src/main/resources/mapper/brandgating/BrandGatingMapper.xml"), StandardCharsets.UTF_8); + // 列表:桌面版 list_gating 的排序与分页 + assertThat(xml).contains("ORDER BY id DESC").contains("LIMIT #{f.offset}, #{f.limit}"); + // 严禁拼接筛选值 + assertThat(xml).doesNotContain("${"); + // 关键词:brand/asin 双列 LIKE(桌面版同口径) + assertThat(xml).contains("brand LIKE CONCAT('%', #{f.keyword}, '%')") + .contains("asin LIKE CONCAT('%', #{f.keyword}, '%')"); + // 启停:status=1 清 disabled_at、=0 记 NOW(),都刷 updated_at=NOW()(桌面版 set_status_gating) + assertThat(xml).contains("disabled_at = IF(#{status} = 1, NULL, NOW())").contains("updated_at = NOW()"); + // 统计:分组只数生效行(status=1),国家按 count DESC(桌面版 by_country) + assertThat(xml).contains("WHERE status = 1").doesNotContain("WHERE status = 1 AND"); + assertThat(xml).contains("ORDER BY count DESC"); + // 「全部」哨兵不过滤(桌面版 country != "全部" 同口径) + assertThat(xml).contains("f.country != '全部'").contains("f.gatingType != '全部'").contains("f.source != '全部'"); + } + + @Test + @DisplayName("控制器契约:权限键 admin_brand_gating、逐端点 requireUser + requireConsolePageAccess 把门") + void controllerGatesEveryEndpointWithPermissionKey() throws Exception { + String source = Files.readString(Path.of( + "src/main/java/com/nanri/aiimage/modules/brandgating/controller/BrandGatingController.java"), + StandardCharsets.UTF_8); + assertThat(source).contains("PERMISSION_KEY = \"admin_brand_gating\""); + assertThat(source).contains("adminAuthSupport.requireUser(request)"); + assertThat(source).contains("requireConsolePageAccess(operator, DENIAL_MESSAGE, PERMISSION_KEY)"); + // 6 个端点方法都必须先过把门助手 + long gated = source.split("requireBrandGatingAccess\\(request\\);", -1).length - 1; + assertThat(gated).isEqualTo(6); + } +}