feat(admin): Java 补齐后台缺失能力(软件版本/图生视频管理/店铺记录列表)与菜单排序
将 Flask 后台仅本地实现、Java 缺失的模块落为原生端点(替代 15124 本地面,
向"单一 Java 后台、可退役 15124"收敛):
- softwareversion: GET /api/admin/versions、POST /api/admin/version(web_config +
公开桶 nanri-image/versions/ 直链,桌面端"检测更新"同表兼容)
- imagevideo 管理端: GET /api/admin/image-video-tasks、/{taskId}、
POST /download-zip(近3天 IMAGE_VIDEO_WORKFLOW,语义对齐 Flask)
- shopdatacrawl 管理端: GET /api/admin/shop-data-crawl-tasks(按店分组取最新结果,
窗口函数)、POST /download-zip(流式 + X-Archive-*-Count)
- 权限: 菜单同级拖拽排序 POST /column/reorder(事务内按序重排兄弟 sort_order);
PermissionMenuCreate/UpdateRequest 补 snake_case 别名兼容旧控制台 body
以上端点均 requireAdminOrInternal 鉴权;含 PermissionMenuService 早前已改动的
hasAnyAdminMenu 等菜单权限逻辑(本迁移一环)。
This commit is contained in:
+30
@@ -31,7 +31,11 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@@ -80,6 +84,32 @@ public class PermissionMenuController {
|
||||
return ApiResponse.success("删除成功", null);
|
||||
}
|
||||
|
||||
@PostMapping("/column/reorder")
|
||||
@Operation(summary = "同级菜单拖拽排序")
|
||||
public ApiResponse<Void> reorderColumns(HttpServletRequest httpRequest,
|
||||
@RequestBody(required = false) Map<String, Object> body) {
|
||||
requireAdmin(httpRequest);
|
||||
Object raw = body == null ? null
|
||||
: (body.get("ordered_ids") != null ? body.get("ordered_ids") : body.get("orderedIds"));
|
||||
if (!(raw instanceof List<?> list)) {
|
||||
throw new BusinessException("排序参数无效");
|
||||
}
|
||||
List<Long> ids = new ArrayList<>(list.size());
|
||||
for (Object item : list) {
|
||||
if (item instanceof Number number) {
|
||||
ids.add(number.longValue());
|
||||
} else if (item instanceof String text) {
|
||||
try {
|
||||
ids.add(Long.parseLong(text.trim()));
|
||||
} catch (NumberFormatException ignore) {
|
||||
// 忽略非数字项
|
||||
}
|
||||
}
|
||||
}
|
||||
permissionMenuService.reorder(ids);
|
||||
return ApiResponse.success("排序已保存", null);
|
||||
}
|
||||
|
||||
@GetMapping("/permission-users/{userId}/columns")
|
||||
@Operation(summary = "查询用户直接授权菜单 ID 列表",
|
||||
description = "columnIds 仅表示数据库保存的直接授权,所有角色都不包含递归或虚拟权限")
|
||||
|
||||
+4
@@ -11,6 +11,7 @@ public class PermissionMenuCreateRequest {
|
||||
private String name;
|
||||
|
||||
@NotBlank(message = "菜单标识不能为空")
|
||||
@JsonAlias("column_key")
|
||||
private String columnKey;
|
||||
|
||||
/** 直接父菜单;null 表示根菜单。 */
|
||||
@@ -18,10 +19,13 @@ public class PermissionMenuCreateRequest {
|
||||
private Long parentId;
|
||||
|
||||
@NotBlank(message = "菜单类型不能为空")
|
||||
@JsonAlias("menu_type")
|
||||
private String menuType;
|
||||
|
||||
@NotBlank(message = "菜单路由不能为空")
|
||||
@JsonAlias("route_path")
|
||||
private String routePath;
|
||||
|
||||
@JsonAlias("sort_order")
|
||||
private Integer sortOrder;
|
||||
}
|
||||
|
||||
+4
@@ -11,6 +11,7 @@ public class PermissionMenuUpdateRequest {
|
||||
private String name;
|
||||
|
||||
@NotBlank(message = "菜单标识不能为空")
|
||||
@JsonAlias("column_key")
|
||||
private String columnKey;
|
||||
|
||||
/** 直接父菜单;null 表示根菜单。 */
|
||||
@@ -18,10 +19,13 @@ public class PermissionMenuUpdateRequest {
|
||||
private Long parentId;
|
||||
|
||||
@NotBlank(message = "菜单类型不能为空")
|
||||
@JsonAlias("menu_type")
|
||||
private String menuType;
|
||||
|
||||
@NotBlank(message = "菜单路由不能为空")
|
||||
@JsonAlias("route_path")
|
||||
private String routePath;
|
||||
|
||||
@JsonAlias("sort_order")
|
||||
private Integer sortOrder;
|
||||
}
|
||||
|
||||
+73
@@ -1,6 +1,7 @@
|
||||
package com.nanri.aiimage.modules.permission.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
|
||||
import com.nanri.aiimage.modules.permission.mapper.PermissionMenuMapper;
|
||||
@@ -149,6 +150,54 @@ public class PermissionMenuService {
|
||||
permissionMenuMapper.deleteById(entity.getId());
|
||||
}
|
||||
|
||||
/**
|
||||
* 同级菜单拖拽重排:orderedIds 为同一父级下按新顺序排列的菜单 ID 列表。
|
||||
* 不在列表中的兄弟节点保持原相对顺序追加在末尾,重排块锚定在原最小 sort_order,避免跨级穿插。
|
||||
*/
|
||||
@Transactional
|
||||
public void reorder(List<Long> orderedIds) {
|
||||
if (orderedIds == null || orderedIds.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
List<Long> ids = new ArrayList<>(new LinkedHashSet<>(orderedIds));
|
||||
if (ids.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
PermissionMenuEntity anchor = permissionMenuMapper.selectById(ids.get(0));
|
||||
if (anchor == null) {
|
||||
throw new BusinessException("菜单不存在");
|
||||
}
|
||||
Long parentId = anchor.getParentId();
|
||||
String menuType = anchor.getMenuType();
|
||||
List<PermissionMenuEntity> siblings = permissionMenuMapper.selectList(new LambdaQueryWrapper<PermissionMenuEntity>()
|
||||
.eq(PermissionMenuEntity::getMenuType, menuType)
|
||||
.eq(PermissionMenuEntity::getParentId, parentId)
|
||||
.orderByAsc(PermissionMenuEntity::getSortOrder)
|
||||
.orderByAsc(PermissionMenuEntity::getId));
|
||||
int minSort = siblings.isEmpty() ? 0
|
||||
: (siblings.get(0).getSortOrder() == null ? 0 : siblings.get(0).getSortOrder());
|
||||
Map<Long, PermissionMenuEntity> remaining = siblings.stream()
|
||||
.filter(s -> s.getId() != null)
|
||||
.collect(Collectors.toMap(PermissionMenuEntity::getId, Function.identity(), (a, b) -> a));
|
||||
List<PermissionMenuEntity> ordered = new ArrayList<>(siblings.size());
|
||||
for (Long id : ids) {
|
||||
PermissionMenuEntity sibling = remaining.remove(id);
|
||||
if (sibling != null) {
|
||||
ordered.add(sibling);
|
||||
}
|
||||
}
|
||||
ordered.addAll(remaining.values());
|
||||
int sort = minSort;
|
||||
for (PermissionMenuEntity sibling : ordered) {
|
||||
if (!Objects.equals(sibling.getSortOrder(), sort)) {
|
||||
permissionMenuMapper.update(null, new LambdaUpdateWrapper<PermissionMenuEntity>()
|
||||
.eq(PermissionMenuEntity::getId, sibling.getId())
|
||||
.set(PermissionMenuEntity::getSortOrder, sort));
|
||||
}
|
||||
sort += 10;
|
||||
}
|
||||
}
|
||||
|
||||
/** Returns only persisted direct grant IDs (never recursively expanded). */
|
||||
public UserColumnIdsVo getUserColumnIds(Long userId, String menuType) {
|
||||
return getUserColumnIds(null, userId, menuType);
|
||||
@@ -314,6 +363,30 @@ public class PermissionMenuService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断操作者是否可见任一所给后台菜单(按 column_key,限定 admin 菜单类型)。
|
||||
* 超管直通;其余取直接授权递归展开后的有效菜单做交集。
|
||||
*/
|
||||
public boolean hasAnyAdminMenu(AdminUserEntity operator, List<String> columnKeys) {
|
||||
if (operator == null || operator.getId() == null || columnKeys == null || columnKeys.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
if (isSuperAdmin(operator)) {
|
||||
return true;
|
||||
}
|
||||
List<PermissionMenuEntity> menus = loadMenus(MENU_TYPE_ADMIN);
|
||||
List<Long> wantedIds = menus.stream()
|
||||
.filter(menu -> menu.getColumnKey() != null && columnKeys.contains(menu.getColumnKey()))
|
||||
.map(PermissionMenuEntity::getId)
|
||||
.filter(Objects::nonNull)
|
||||
.toList();
|
||||
if (wantedIds.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
Set<Long> effective = expandDescendantIds(new LinkedHashSet<>(loadDirectColumnIds(operator.getId())), menus);
|
||||
return wantedIds.stream().anyMatch(effective::contains);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void updateUserColumnPermissions(Long userId, UserColumnPermissionUpdateRequest request) {
|
||||
updateUserColumnPermissions(null, userId, request);
|
||||
|
||||
Reference in New Issue
Block a user