feat(appearance-patent): 顶部全量「导出」摘掉+每张主管卡加「删除」(2026-11-11 客户「这个可以不要 有下载就行了」「也要加个删除按钮」)

删除走新 DELETE /api/admin/appearance-patent-clean-items/supervisors?supervisor_user_id=…:谓词与卡片「下载」逐字同源(共享 cleanItemConds + supervisorScopeConds,Same SQL 下推),所见即所删;supervisor_user_id 必填、服务侧先挡空值(缺值会让 <if> 不生效=退化成整表删除),日期倒挂同全站口径拒;同一 requireCleanItemsAccess+readCompanyIdOrOwn 正门(非超管只能删本公司行),并打一条带 operatorId/主管/过滤面/删除行数的日志留痕;只删快照明细,不碰结果文件与任务记录。前端破坏性动作先 openAdminConfirm(点名主管与条数、danger),删完回读并在删掉本页最后一张卡时回退页;读不到主管的卡两钮都禁用。护栏:XML_STATEMENT_TOTAL 155→156、NOT_MIGRATED 登记 deleteSupervisorItems、controller 只读判据改为「无 POST/PUT+DELETE 必须在位」、wiring 新增第 4 个发送口(26 处/19 组)。
This commit is contained in:
2026-11-11 13:39:17 +08:00
parent e1767faff5
commit 3dec8d41ed
11 changed files with 383 additions and 103 deletions
@@ -20,10 +20,12 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -34,10 +36,11 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/**
* 后管「外观专利无侵权数据」只读页(v1.3 R2/R3)。数据由出表成功点自动同步落表
* ({@code AppearancePatentCleanSyncService}),本页只读——无写/删接口,下载走既有结果直链/
* 任务中心;另有 GET 导出端点(2026-11-11 客户需求「数据得导出来」):与分页查询同一过滤面
* (含公司隔离正门),服务侧卡导出上限,主管列为读侧现算列,无写/删/导入;分组筛选同日落地
* 后管「外观专利无侵权数据」页(v1.3 R2/R3)。数据由出表成功点自动同步落表
* ({@code AppearancePatentCleanSyncService}),本页不出表、不改明细内容——下载走导出端点、
* 删除走 {@code DELETE /supervisors}(2026-11-11 客户「也要加个删除按钮」,按主管删快照明细行,
* 不碰结果文件与任务记录);另有 GET 导出端点(2026-11-11 客户需求「数据得导出来」):与分页查询
* 同一过滤面(含公司隔离正门),服务侧卡导出上限,主管列为读侧现算列,无导入;分组筛选同日落地
* (客户口径「主管就是组长,可以筛选组长来导出,就是分组」)——group_id 参数(biz_shop_manage_group.id)
* 在分页与导出同面生效,服务侧按 selectUserIdsByGroupId 解析「组长本人+名下子账户」整集后
* SQL 侧下推;下拉选项复用既有 GET /shop-manages/groups(与去重页/店铺管理同源),不下新端点。
@@ -48,6 +51,7 @@ import java.time.format.DateTimeFormatter;
*/
@RestController
@RequiredArgsConstructor
@Slf4j
@RequestMapping("/api/admin/appearance-patent-clean-items")
@Tag(name = "外观专利无侵权数据", description = "后管只读页:出表成功自动同步的「结论=无侵权」明细,按分公司隔离分页查询与导出。")
public class AdminAppearancePatentCleanItemsController {
@@ -157,6 +161,36 @@ public class AdminAppearancePatentCleanItemsController {
.body(bytes);
}
@DeleteMapping("/supervisors")
@Operation(summary = "删除某位主管名下的外观专利数据库明细", description = "卡片上的「删除」(2026-11-11 客户"
+ "「也要加个删除按钮」):谓词与卡片「下载」逐字同源(同一过滤面+同一主管归属表达式),"
+ "supervisor_user_id 必填——缺值不按主管收窄就等于删整个过滤面,直接按业务错误拒绝。"
+ "只删快照明细行,不动结果文件与任务记录。返回实际删除行数。")
public ApiResponse<Integer> deleteBySupervisor(
@Parameter(description = "主管用户 id(必填,卡片归属口径)")
@RequestParam(name = "supervisor_user_id") Long supervisorUserId,
@Parameter(description = "国家代码(如 DE、UK)") @RequestParam(name = "country", required = false) String country,
@Parameter(description = "同步开始日期(包含)")
@RequestParam(name = "start_date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate,
@Parameter(description = "同步结束日期(包含)")
@RequestParam(name = "end_date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate,
@Parameter(description = "分组 id:按该分组「组长本人+名下子账户」的用户集过滤(主管=组长)")
@RequestParam(name = "group_id", required = false) Long groupId,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId,
HttpServletRequest request) {
RequestOperator operator = requireCleanItemsAccess(request);
AdminUserEntity user = operator.user();
// 删除与查询/导出同一公司隔离正门:非超管只能删本公司的行(忽略请求传参)。
Long scopedCompanyId = dataReadScope.readCompanyIdOrOwn(user, companyId);
int deleted = cleanItemQueryService.deleteBySupervisor(supervisorUserId, country, startDate, endDate,
groupId, scopedCompanyId);
// 管理端真删必须留痕(谁、删了哪位主管、什么过滤面、删了多少行):日志是唯一的取证面。
log.info("[appearance-patent-clean] 按主管删除明细 operatorId={} supervisorUserId={} country={} "
+ "start={} end={} groupId={} companyId={} deleted={}",
operator.id(), supervisorUserId, country, startDate, endDate, groupId, scopedCompanyId, deleted);
return ApiResponse.success(deleted);
}
private RequestOperator requireCleanItemsAccess(HttpServletRequest request) {
AdminUserEntity operator = resolveOperator(request);
if (operator == null || operator.getId() == null || operator.getId() <= 0) {
@@ -111,4 +111,20 @@ public interface AppearancePatentCleanItemMapper extends BaseMapper<CleanItemEnt
@Param("supervisorUserId") Long supervisorUserId,
@Param("offset") long offset,
@Param("limit") int limit);
/**
* 删除单个主管名下明细(2026-11-11 卡片上的「删除」)。
*
* <p>谓词与 {@link #selectSupervisorItems} 逐字同源(共享 {@code cleanItemConds} +
* {@code supervisorScopeConds}):所见即所删。{@code supervisorUserId} 为 null 时那条
* {@code <if>} 不生效=退化成整表删除,所以调用方(Service)必须先挡空值。</p>
*/
int deleteSupervisorItems(@Param("companyId") Long companyId,
@Param("taskId") Long taskId,
@Param("asin") String asin,
@Param("country") String country,
@Param("startDate") LocalDate startDate,
@Param("endDate") LocalDate endDate,
@Param("userIds") List<Long> userIds,
@Param("supervisorUserId") Long supervisorUserId);
}
@@ -301,6 +301,37 @@ public class AppearancePatentCleanItemQueryService {
return writeExportWorkbook(items);
}
/**
* 删除<b>单个主管</b>名下明细(2026-11-11 客户「也要加个删除按钮」):谓词与
* {@link #exportBySupervisor} 逐字同源(同一过滤面 + 同一归属表达式),所以「看到的条数」
* 与「删掉的条数」不会分叉。
*
* <p>{@code supervisorUserId} 必须是显式传入的主管 id:SQL 里那条 {@code <if>} 缺值时不生效,
* 等于删掉整个过滤面(最坏是全表),所以这里先挡空值/非法值并抛业务错误——宁可拒绝,不接
* 「不按主管收窄的删除」。本方法只删快照明细行,不碰结果文件与任务记录(与同步链的
* {@code deleteByResultId} 覆盖式重写互不影响:下一次同步会按 result_id 重新写入)。</p>
*
* @return 实际删除行数(前端拿它做「已删除 N 条」的反馈,不猜)
*/
public int deleteBySupervisor(Long supervisorUserId, String country, LocalDate startDate,
LocalDate endDate, Long groupId, Long scopedCompanyId) {
if (supervisorUserId == null || supervisorUserId <= 0) {
throw new BusinessException("缺少主管,无法按主管删除");
}
if (startDate != null && endDate != null && startDate.isAfter(endDate)) {
throw new BusinessException("开始日期不能晚于结束日期");
}
Long companyId = scopedCompanyId != null && scopedCompanyId > 0 ? scopedCompanyId : null;
String safeCountry = trimToNull(country);
List<Long> groupUserIds = groupUserIds(groupId);
if (groupUserIds != null && groupUserIds.isEmpty()) {
// 与导出同口径:分组解析不出用户集 ⇒ 过滤面本身是空的,没有可删的行。
return 0;
}
return cleanItemMapper.deleteSupervisorItems(companyId, null, null, safeCountry, startDate, endDate,
groupUserIds, supervisorUserId);
}
/**
* 分组筛选 → 该分组「组长本人+名下子账户」的用户 id 集({@code null} = 没选分组、不过滤);
* id 非法(≤0)按没选处理,不把它当全量之外的第三档。解析交给
@@ -112,6 +112,17 @@
LIMIT #{offset}, #{limit}
</select>
<!-- 卡片「删除」=删掉该主管名下明细(2026-11-11 客户「也要加个删除按钮」)。谓词与「下载」
同源:共享 cleanItemConds + supervisorScopeConds,一条语句定完,不接受「先查 id 再逐批删」
——两段之间新同步进来的行会漏网。supervisor 条件缺失时 <if> 不生效,所以服务侧必须先
校验 supervisorUserId 非空(Service 里已挡),这里不承担兜底。 -->
<delete id="deleteSupervisorItems">
DELETE i
FROM biz_appearance_patent_clean_item i
LEFT JOIN users u ON u.id = i.user_id
WHERE 1=1 <include refid="cleanItemConds"/> <include refid="supervisorScopeConds"/>
</delete>
<!-- 卡片「下载」=导出该主管名下全量明细(分页/导出同一过滤面 + 主管归属条件)。 -->
<select id="countSupervisorItems" resultType="long">
SELECT COUNT(*)
@@ -174,7 +174,11 @@ class MigratedSqlEquivalenceTest {
"AppearancePatentCleanItemMapper#countSupervisors",
"AppearancePatentCleanItemMapper#selectSupervisorSummaries",
"AppearancePatentCleanItemMapper#countSupervisorItems",
"AppearancePatentCleanItemMapper#selectSupervisorItems");
"AppearancePatentCleanItemMapper#selectSupervisorItems",
// 2026-11-11 卡片「删除」:1 条新写的 delete(谓词与按主管导出的 select
// 逐字同源)。delete 不计 select,故 XML_SELECT_TOTAL 保持 109
// (SqlLayeringConventionTest.XML_STATEMENT_TOTAL 同轮 155 → 156)。
"AppearancePatentCleanItemMapper#deleteSupervisorItems");
/** 账本 5 列:接口 / 方法 / @Select 种类 / 是否含常量插值 / 注解原文(Java 反转义后那条串)。 */
private static final int LEDGER_COLUMNS = 5;
@@ -104,7 +104,9 @@ class SqlLayeringConventionTest {
// 151 → 155:2026-11-11「按主管划分」同一 mapper 再落 4 条 select——主管聚合 count/page
// +按主管导出 count/page(users 联表按归属表达式收窄),同轮登记进 NOT_MIGRATED
//(该文件 XML_SELECT_TOTAL 105 → 109)。
private static final int XML_STATEMENT_TOTAL = 155;
// 155 → 156:2026-11-11 卡片「删除」落 1 条 delete(deleteSupervisorItems,谓词与按主管导出
// 逐字同源)——delete 不计入该文件 XML_SELECT_TOTAL,只点名进 NOT_MIGRATED。
private static final int XML_STATEMENT_TOTAL = 156;
/**
* wrapper 里夹带函数级 SQL 的现状("这不是简单单表"的证据),文件名 → 条数:
@@ -55,6 +55,7 @@ import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
/**
@@ -98,9 +99,13 @@ class AdminAppearancePatentCleanItemsControllerTest {
assertTrue(source.contains("/api/admin/appearance-patent-clean-items"),
"端点必须是 GET /api/admin/appearance-patent-clean-items(蓝图 §3.2)");
assertTrue(source.contains("@GetMapping"), "查询端点必须落在 @GetMapping");
assertFalse(source.contains("@PostMapping") || source.contains("@PutMapping")
|| source.contains("@DeleteMapping"),
"本页只读、无写/删接口(蓝图 §3.2;后管要下载走既有结果直链/任务中心)");
// 2026-11-11 客户「也要加个删除按钮」:本页从纯只读变为「读+按主管删」——
// 允许且只允许 DELETE /supervisors(按主管收窄,见 按主管删除端点就位 一格),
// 仍然禁 POST/PUT(不出表、不改明细内容、无导入)。
assertFalse(source.contains("@PostMapping") || source.contains("@PutMapping"),
"本页不出表、不改明细、无导入:不得有 POST/PUT(蓝图 §3.2)");
assertTrue(source.contains("@DeleteMapping"),
"删除按钮必须落在 @DeleteMapping(客户「也要加个删除按钮」,2026-11-11)");
}
@Test
@@ -373,9 +378,10 @@ class AdminAppearancePatentCleanItemsControllerTest {
String source = stripComments(Files.readString(CONTROLLER));
assertTrue(source.contains("\"/export\""),
"导出必须是 GET /api/admin/appearance-patent-clean-items/export(2026-11-11 客户需求「数据得导出来」)");
// 导出仍是只读:本页禁写/删/导入的判据由「控制器与只读端点就位」一格把守(无 Post/Put/Delete),
// 导出落 GET 不破那格;导出与分页都必须各自调用 requireCleanItemsAccess+readCompanyIdOrOwn
//(私有两支各调一次,缺一支即红——导出不许绕过页签的鉴权与公司隔离)。
// 导出不写库:本页的写面只有 2026-11-11 客户要的那一个按主管删除(DELETE /supervisors),
// 出表/POST/PUT 仍由「控制器与只读端点就位」一格把守(无 Post/Put);
// 导出与分页都必须各自调用 requireCleanItemsAccess+readCompanyIdOrOwn
//(私有多支各调一次,缺一支即红——导出不许绕过页签的鉴权与公司隔离)。
long gateCalls = source.split("requireCleanItemsAccess\\(request\\)", -1).length - 1;
assertTrue(gateCalls >= 2, "分页与导出两支 handler 都必须过 requireCleanItemsAccess 正门,实得 " + gateCalls);
long scopeCalls = source.split("readCompanyIdOrOwn\\(", -1).length - 1;
@@ -663,6 +669,100 @@ class AdminAppearancePatentCleanItemsControllerTest {
assertTrue(source.contains("AppearancePatentSupervisorPageVo"), "主管卡片页信封类型必须点名");
}
// ===================== 2026-11-11 客户「也要加个删除按钮」 =====================
@Test
void 按主管删除端点就位且必须带主管与留痕() throws IOException {
String source = stripComments(Files.readString(CONTROLLER));
assertTrue(source.contains("@DeleteMapping(\"/supervisors\")"),
"删除必须是 DELETE /api/admin/appearance-patent-clean-items/supervisors(卡片上的「删除」)");
assertTrue(source.contains("name = \"supervisor_user_id\", required = true")
|| source.contains("supervisor_user_id"),
"删除必须带 supervisor_user_id(不按主管收窄的删除等于删整个过滤面)");
assertTrue(source.contains("deleteBySupervisor("), "删除必须落到服务的 deleteBySupervisor");
// 破坏性动作必须留痕:operatorId / supervisorUserId / deleted 三个字段都要落日志。
assertTrue(source.contains("operator.id()") && source.contains("deleted="),
"管理端真删必须打一条带 operatorId 与删除行数的日志(否则事后无法归因是谁删的)");
// 删除与查询/导出同一公司正门 + 同一鉴权闸。
long gateCalls = source.split("requireCleanItemsAccess\\(request\\)", -1).length - 1;
assertTrue(gateCalls >= 3, "分页/导出/删除三支 handler 都必须过 requireCleanItemsAccess,实得 " + gateCalls);
long scopeCalls = source.split("readCompanyIdOrOwn\\(", -1).length - 1;
assertTrue(scopeCalls >= 3, "分页/导出/删除三支 handler 都必须走 readCompanyIdOrOwn 公司隔离,实得 " + scopeCalls);
}
@Test
void 控制器删除走同一正门并回删除行数() {
AppearancePatentCleanItemQueryService queryService = mock(AppearancePatentCleanItemQueryService.class);
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
DataReadScope dataReadScope = mock(DataReadScope.class);
AdminAppearancePatentCleanItemsController controller = new AdminAppearancePatentCleanItemsController(
queryService, authSupport, mock(PermissionMenuService.class), 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");
// 非超管场景由 readCompanyIdOrOwn 自己收窄,这里钉「正门的返回值原样交给服务」。
when(dataReadScope.readCompanyIdOrOwn(operator, 5L)).thenReturn(5L);
when(queryService.deleteBySupervisor(9L, "DE", null, null, null, 5L)).thenReturn(120);
ApiResponse<Integer> response = controller.deleteBySupervisor(9L, "DE", null, null, null, 5L, request);
verify(dataReadScope).readCompanyIdOrOwn(operator, 5L);
verify(queryService).deleteBySupervisor(9L, "DE", null, null, null, 5L);
assertEquals(Boolean.TRUE, response.isSuccess());
assertEquals(120, response.getData(), "必须把实际删除行数回给页面(前端拿它做反馈,不猜)");
}
@Test
void 删除服务缺主管直接拒绝且一个字节都不删() {
AppearancePatentCleanItemMapper mapper = mock(AppearancePatentCleanItemMapper.class);
AppearancePatentCleanItemQueryService service = new AppearancePatentCleanItemQueryService(
mapper, mock(AdminUserMapper.class), mock(ShopManageGroupMapper.class));
BusinessException ex = assertThrows(BusinessException.class,
() -> service.deleteBySupervisor(null, null, null, null, null, 5L));
assertTrue(ex.getMessage().contains("缺少主管"), "缺主管必须明确拒绝(不能退化成整表删除)");
assertThrows(BusinessException.class,
() -> service.deleteBySupervisor(0L, null, null, null, null, 5L));
verifyNoInteractions(mapper);
BusinessException reversed = assertThrows(BusinessException.class,
() -> service.deleteBySupervisor(9L, null, LocalDate.of(2026, 11, 12),
LocalDate.of(2026, 11, 1), null, 5L));
assertTrue(reversed.getMessage().contains("开始日期不能晚于结束日期"), "日期倒挂同全站口径拒绝");
verifyNoInteractions(mapper);
}
@Test
void 删除服务按过滤面与主管下推且分组空集短路() {
AppearancePatentCleanItemMapper mapper = mock(AppearancePatentCleanItemMapper.class);
ShopManageGroupMapper groupMapper = mock(ShopManageGroupMapper.class);
AppearancePatentCleanItemQueryService service = new AppearancePatentCleanItemQueryService(
mapper, mock(AdminUserMapper.class), groupMapper);
// 分组解析出的用户集(组长本人+名下子账户)整集下推,删除与导出同一口径。
when(groupMapper.selectUserIdsByGroupId(3L)).thenReturn(List.of(11L, 12L));
when(mapper.deleteSupervisorItems(5L, null, null, "DE", null, null, List.of(11L, 12L), 9L)).thenReturn(88);
int deleted = service.deleteBySupervisor(9L, "DE", null, null, 3L, 5L);
assertEquals(88, deleted, "删除行数原样回传");
ArgumentCaptor<List<Long>> userIds = ArgumentCaptor.forClass(List.class);
verify(mapper).deleteSupervisorItems(eq(5L), isNull(), isNull(), eq("DE"), isNull(), isNull(),
userIds.capture(), eq(9L));
assertEquals(List.of(11L, 12L), userIds.getValue(), "分组用户集必须整集下推(铁律 20,不在 Java 侧过滤)");
// 分组解析不出用户(分组已删):过滤面本身为空,一条都不许删。
AppearancePatentCleanItemMapper emptyMapper = mock(AppearancePatentCleanItemMapper.class);
ShopManageGroupMapper emptyGroupMapper = mock(ShopManageGroupMapper.class);
when(emptyGroupMapper.selectUserIdsByGroupId(3L)).thenReturn(List.of());
AppearancePatentCleanItemQueryService emptyService = new AppearancePatentCleanItemQueryService(
emptyMapper, mock(AdminUserMapper.class), emptyGroupMapper);
assertEquals(0, emptyService.deleteBySupervisor(9L, null, null, null, 3L, 5L));
verifyNoInteractions(emptyMapper);
}
/** 导出/分页用例共用的明细行夹具:task 归 owner,值非空便于按列对撞。 */
private static CleanItemEntity rowEntity(long id, long userId) { CleanItemEntity entity = new CleanItemEntity();
entity.setId(id);