task-116: 后台管理新增/导入表单弹窗化 + 分组管理独立菜单与UI优化 + 轻量进度端点
- 后台管理页(admin)所有面板的新增/导入表单改为弹窗操作,原有字段 ID 全部保留、提交逻辑不变;导入删除入口不再触发二次确认拦截 - 分组管理升级为独立菜单(V102 + schema initializer),移除 5 个面板内的管理分组按钮;分组列表改为蓝白主题、增加权限分组横幅 - Python 侧 group-manage 权限守卫(_ensure_backend_menu_access 补充 group-manage) - 引入 V101(biz_task_file_job 复合索引)+ 新增 TaskProgressLight/TaskFileJob 轻量端点与进度聚合作 - 前端 progress-light / page-separated-loads / dispatch-guard 共享模块及单元测试
This commit is contained in:
+3
-1
@@ -63,11 +63,13 @@ public class InvalidAsinDataController {
|
||||
@Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page,
|
||||
@Parameter(description = "每页数量") @RequestParam(defaultValue = "15") Long pageSize,
|
||||
@Parameter(description = "模糊搜索关键字") @RequestParam(required = false) String keyword,
|
||||
@Parameter(description = "ASIN 模糊搜索") @RequestParam(required = false) String dataValue,
|
||||
@Parameter(description = "品牌模糊搜索") @RequestParam(required = false) String brand,
|
||||
@Parameter(description = "分组 ID") @RequestParam(required = false) Long groupId,
|
||||
HttpServletRequest request) {
|
||||
RequestOperator operator = requireInvalidAsinDataAccess(request);
|
||||
return ApiResponse.success(invalidAsinDataService.page(
|
||||
page, pageSize, keyword, groupId, operator.id(), operator.superAdmin()));
|
||||
page, pageSize, keyword, dataValue, brand, groupId, operator.id(), operator.superAdmin()));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
|
||||
+5
-1
@@ -31,15 +31,19 @@ public class InvalidAsinDataService {
|
||||
private final InvalidAsinDataMapper invalidAsinDataMapper;
|
||||
private final ShopManageGroupService shopManageGroupService;
|
||||
|
||||
public InvalidAsinDataPageVo page(long page, long pageSize, String keyword, Long groupId, Long operatorId, boolean superAdmin) {
|
||||
public InvalidAsinDataPageVo page(long page, long pageSize, String keyword, String dataValue, String brand, Long groupId, Long operatorId, boolean superAdmin) {
|
||||
long safePage = Math.max(page, 1);
|
||||
long safePageSize = Math.min(Math.max(pageSize, 1), 100);
|
||||
String safeKeyword = keyword == null ? "" : keyword.trim();
|
||||
String safeDataValue = dataValue == null ? "" : dataValue.trim();
|
||||
String safeBrand = brand == null ? "" : brand.trim();
|
||||
LambdaQueryWrapper<InvalidAsinDataEntity> query = new LambdaQueryWrapper<InvalidAsinDataEntity>()
|
||||
.and(!safeKeyword.isEmpty(), wrapper -> wrapper
|
||||
.like(InvalidAsinDataEntity::getDataValue, safeKeyword)
|
||||
.or()
|
||||
.like(InvalidAsinDataEntity::getBrand, safeKeyword))
|
||||
.like(!safeDataValue.isEmpty(), InvalidAsinDataEntity::getDataValue, safeDataValue)
|
||||
.like(!safeBrand.isEmpty(), InvalidAsinDataEntity::getBrand, safeBrand)
|
||||
.orderByDesc(InvalidAsinDataEntity::getId);
|
||||
if (!superAdmin) {
|
||||
Long fixedGroupId = resolveFixedAccessibleGroupId(operatorId);
|
||||
|
||||
Reference in New Issue
Block a user