From fec1341c1cb8e11cfbe3fa7dfabe447edb72b630 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 15:12:43 +0800
Subject: [PATCH] refactor(auth): 移除多个模块中的权限校验注解
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java
index e4d9df3..dd8bf2d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java
@@ -11,6 +11,8 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.config.MesProAndonConfigSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.andon.MesProAndonConfigDO;
import cn.iocoder.yudao.module.mes.service.pro.andon.MesProAndonConfigService;
+import cn.iocoder.yudao.module.system.api.permission.RoleApi;
+import cn.iocoder.yudao.module.system.api.permission.dto.RoleRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -40,6 +42,8 @@
@Resource
private AdminUserApi adminUserApi;
+ @Resource
+ private RoleApi roleApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓瀹夌伅鍛煎彨閰嶇疆")
@@ -68,7 +72,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱瀹夌伅鍛煎彨閰嶇疆")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-andon-config:query')")
public CommonResult<MesProAndonConfigRespVO> getAndonConfig(@RequestParam("id") Long id) {
MesProAndonConfigDO config = andonConfigService.getAndonConfig(id);
if (config == null) {
@@ -79,7 +82,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱瀹夌伅鍛煎彨閰嶇疆鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pro-andon-config:query')")
public CommonResult<PageResult<MesProAndonConfigRespVO>> getAndonConfigPage(@Valid MesProAndonConfigPageReqVO pageReqVO) {
PageResult<MesProAndonConfigDO> pageResult = andonConfigService.getAndonConfigPage(pageReqVO);
return success(new PageResult<>(buildConfigRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -87,7 +89,6 @@
@GetMapping("/list")
@Operation(summary = "鑾峰緱瀹夌伅鍛煎彨閰嶇疆鍒楄〃")
- @PreAuthorize("@ss.hasPermission('mes:pro-andon-config:query')")
public CommonResult<List<MesProAndonConfigRespVO>> getAndonConfigList() {
List<MesProAndonConfigDO> list = andonConfigService.getAndonConfigList();
return success(buildConfigRespVOList(list));
@@ -102,10 +103,15 @@
// 1. 鎵归噺鑾峰彇鍏宠仈鏁版嵁
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(list, MesProAndonConfigDO::getHandlerUserId));
+ Map<Long, RoleRespDTO> roleMap = roleApi.getRoleMap(
+ convertSet(list, MesProAndonConfigDO::getHandlerRoleId));
// 2. 鎷兼帴 VO
- return BeanUtils.toBean(list, MesProAndonConfigRespVO.class, vo ->
- MapUtils.findAndThen(userMap, vo.getHandlerUserId(),
- user -> vo.setHandlerUserNickname(user.getNickname())));
+ return BeanUtils.toBean(list, MesProAndonConfigRespVO.class, vo -> {
+ MapUtils.findAndThen(userMap, vo.getHandlerUserId(),
+ user -> vo.setHandlerUserNickname(user.getNickname()));
+ MapUtils.findAndThen(roleMap, vo.getHandlerRoleId(),
+ role -> vo.setHandlerRoleName(role.getName()));
+ });
}
}
--
Gitblit v1.9.3