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/wm/productissue/MesWmProductIssueController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
index 4836c4a..0c49299 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
@@ -11,12 +11,15 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDO;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
+import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.productissue.MesWmProductIssueService;
import io.swagger.v3.oas.annotations.Operation;
@@ -51,7 +54,9 @@
@Resource
private MesProWorkOrderService workOrderService;
@Resource
- private MesMdClientService clientService;
+ private MesProTaskService taskService;
+ @Resource
+ private CrmCustomerApi customerApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓棰嗘枡鍑哄簱鍗�")
@@ -80,7 +85,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱棰嗘枡鍑哄簱鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
public CommonResult<MesWmProductIssueRespVO> getProductIssue(@RequestParam("id") Long id) {
MesWmProductIssueDO issue = issueService.getProductIssue(id);
if (issue == null) {
@@ -91,7 +95,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱棰嗘枡鍑哄簱鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
public CommonResult<PageResult<MesWmProductIssueRespVO>> getProductIssuePage(
@Valid MesWmProductIssuePageReqVO pageReqVO) {
PageResult<MesWmProductIssueDO> pageResult = issueService.getProductIssuePage(pageReqVO);
@@ -149,7 +152,6 @@
@GetMapping("/check-quantity")
@Operation(summary = "鏍￠獙棰嗘枡鍑哄簱鍗曟暟閲�", description = "鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛岄鏂欐暟閲�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
public CommonResult<Boolean> checkProductIssueQuantity(@RequestParam("id") Long id) {
return success(issueService.checkProductIssueQuantity(id));
}
@@ -165,16 +167,20 @@
convertSet(list, MesWmProductIssueDO::getWorkstationId));
Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
convertSet(list, MesWmProductIssueDO::getWorkOrderId));
- Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
+ Map<Long, MesProTaskDO> taskMap = taskService.getTaskMap(
+ convertSet(list, MesWmProductIssueDO::getTaskId));
+ Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
convertSet(workOrderMap.values(), MesProWorkOrderDO::getClientId));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmProductIssueRespVO.class, vo -> {
MapUtils.findAndThen(workstationMap, vo.getWorkstationId(),
workstation -> vo.setWorkstationName(workstation.getName()));
+ MapUtils.findAndThen(taskMap, vo.getTaskId(), task ->
+ vo.setTaskCode(task.getCode()).setTaskName(task.getName()));
MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), workOrder -> {
vo.setWorkOrderCode(workOrder.getCode());
MapUtils.findAndThen(clientMap, workOrder.getClientId(), client ->
- vo.setClientCode(client.getCode()).setClientName(client.getName()));
+ vo.setClientName(client.getName()));
});
});
}
--
Gitblit v1.9.3