菜单修改优化

This commit is contained in:
supernijia
2026-07-28 13:40:19 +08:00
parent 567aeaba5d
commit e453e822c0
90 changed files with 9388 additions and 1545 deletions
@@ -48,11 +48,11 @@ public class AdminUserController {
@PostMapping("/user")
@Operation(summary = "创建用户")
public ApiResponse<Void> createUser(HttpServletRequest request,
public ApiResponse<Long> createUser(HttpServletRequest request,
@RequestBody AdminUserCreateRequest body) {
AdminUserEntity currentUser = adminAuthSupport.requireAdmin(request);
adminUserService.createUser(currentUser, body);
return ApiResponse.success("用户创建成功", null);
Long userId = adminUserService.createUser(currentUser, body);
return ApiResponse.success("用户创建成功", userId);
}
@PutMapping("/user/{uid}")
@@ -2,10 +2,13 @@ package com.nanri.aiimage.modules.admin.model.dto;
import lombok.Data;
import java.util.List;
@Data
public class AdminUserCreateRequest {
private String username;
private String password;
private String role;
private Long createdById;
private List<Long> columnIds;
}
@@ -2,8 +2,11 @@ package com.nanri.aiimage.modules.admin.model.dto;
import lombok.Data;
import java.util.List;
@Data
public class AdminUserUpdateRequest {
private String password;
private String role;
private List<Long> columnIds;
}
@@ -11,10 +11,13 @@ import com.nanri.aiimage.modules.admin.model.vo.AdminUserListVo;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.auth.util.WerkzeugPasswordEncoder;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.model.dto.UserColumnPermissionUpdateRequest;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import lombok.RequiredArgsConstructor;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -35,6 +38,7 @@ public class AdminUserService {
private final AdminUserMapper adminUserMapper;
private final WerkzeugPasswordEncoder passwordEncoder;
private final AdminAuthSupport adminAuthSupport;
private final PermissionMenuService permissionMenuService;
public AdminUserListVo listUsers(AdminUserEntity currentUser, Integer page, Integer pageSize,
String username, Long createdById) {
@@ -97,7 +101,8 @@ public class AdminUserService {
return vo;
}
public void createUser(AdminUserEntity currentUser, AdminUserCreateRequest request) {
@Transactional
public Long createUser(AdminUserEntity currentUser, AdminUserCreateRequest request) {
String role = adminAuthSupport.currentRole(currentUser);
if (role == null) {
throw new BusinessException(403, "需要管理员权限");
@@ -150,8 +155,11 @@ public class AdminUserService {
} catch (DuplicateKeyException e) {
throw new BusinessException("用户名已存在");
}
replaceDirectPermissions(currentUser, entity.getId(), request.getColumnIds());
return entity.getId();
}
@Transactional
public void updateUser(AdminUserEntity currentUser, Long uid, AdminUserUpdateRequest request) {
String role = adminAuthSupport.currentRole(currentUser);
if (role == null) {
@@ -160,7 +168,9 @@ public class AdminUserService {
String password = request.getPassword();
String wantRole = request.getRole() == null ? null : request.getRole().trim();
if ((password == null || password.isEmpty()) && (wantRole == null || wantRole.isEmpty())) {
if ((password == null || password.isEmpty())
&& (wantRole == null || wantRole.isEmpty())
&& request.getColumnIds() == null) {
throw new BusinessException("请提供要修改的内容");
}
@@ -206,6 +216,16 @@ public class AdminUserService {
if (dirty) {
adminUserMapper.update(null, update);
}
if (request.getColumnIds() != null) {
replaceDirectPermissions(currentUser, uid, request.getColumnIds());
}
}
private void replaceDirectPermissions(AdminUserEntity operator, Long userId, List<Long> columnIds) {
UserColumnPermissionUpdateRequest permissionRequest = new UserColumnPermissionUpdateRequest();
permissionRequest.setColumnIds(columnIds == null ? List.of() : columnIds);
permissionMenuService.updateUserColumnPermissions(
operator, userId, permissionRequest, PermissionMenuService.MENU_TYPE_APP);
}
public void deleteUser(AdminUserEntity currentUser, Long uid) {
@@ -1,6 +1,5 @@
package com.nanri.aiimage.modules.admin.support;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.auth.service.JwtService;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
@@ -65,27 +64,15 @@ public class AdminAuthSupport {
return "super_admin";
}
if ("admin".equals(storedRole)) {
return resolveAdminRole(user);
return "admin";
}
boolean isAdminFlag = user.getIsAdmin() != null && user.getIsAdmin() == 1;
if (isAdminFlag) {
return resolveAdminRole(user);
if (storedRole.isEmpty() && isAdminFlag) {
return user.getCreatedById() == null ? "super_admin" : "admin";
}
return null;
}
/** 数据库里 role='admin' 中 id 最小者视作超级管理员(与 Python 行为一致)。 */
private String resolveAdminRole(AdminUserEntity user) {
AdminUserEntity superAdmin = adminUserMapper.selectOne(new LambdaQueryWrapper<AdminUserEntity>()
.eq(AdminUserEntity::getRole, "admin")
.orderByAsc(AdminUserEntity::getId)
.last("LIMIT 1"));
if (superAdmin != null && superAdmin.getId().equals(user.getId())) {
return "super_admin";
}
return "admin";
}
private String resolveToken(HttpServletRequest request) {
String authHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
if (authHeader != null && authHeader.startsWith("Bearer ")) {