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/returnsales/MesWmReturnSalesLineController.java | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java
index f57e781..337f54e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java
@@ -8,11 +8,13 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLinePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLineRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLineSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
-import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
+
import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -26,15 +28,11 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-/**
- * 绠＄悊鍚庡彴 - MES 閿�鍞��璐х浉鍏�
- *
- * @author 鑺嬮亾婧愮爜
- */
@Tag(name = "绠＄悊鍚庡彴 - MES 閿�鍞��璐у崟琛�")
@RestController
@RequestMapping("/mes/wm/return-sales-line")
@@ -44,9 +42,9 @@
@Resource
private MesWmReturnSalesLineService returnSalesLineService;
@Resource
- private MesMdItemService itemService;
+ private MdmItemApi mdmItemApi;
@Resource
- private MesMdUnitMeasureService unitMeasureService;
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞��璐у崟琛�")
@@ -75,7 +73,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱閿�鍞��璐у崟琛�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
public CommonResult<MesWmReturnSalesLineRespVO> getReturnSalesLine(@RequestParam("id") Long id) {
MesWmReturnSalesLineDO line = returnSalesLineService.getReturnSalesLine(id);
if (line == null) {
@@ -86,7 +83,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱閿�鍞��璐у崟琛屽垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
public CommonResult<PageResult<MesWmReturnSalesLineRespVO>> getReturnSalesLinePage(
@Valid MesWmReturnSalesLinePageReqVO pageReqVO) {
PageResult<MesWmReturnSalesLineDO> pageResult = returnSalesLineService.getReturnSalesLinePage(pageReqVO);
@@ -96,7 +92,6 @@
@GetMapping("/list-by-return-sales")
@Operation(summary = "鑾峰緱閿�鍞��璐у崟琛屽垪琛紙鎸夐��璐у崟缂栧彿锛�")
@Parameter(name = "returnId", description = "閫�璐у崟缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
public CommonResult<List<MesWmReturnSalesLineRespVO>> getReturnSalesLineListByReturnId(
@RequestParam("returnId") Long returnId) {
List<MesWmReturnSalesLineDO> list = returnSalesLineService.getReturnSalesLineListByReturnId(returnId);
@@ -110,10 +105,11 @@
return Collections.emptyList();
}
// 1. 鑾峰緱鍏宠仈鏁版嵁
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(list, MesWmReturnSalesLineDO::getItemId));
- Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
+ .stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmReturnSalesLineRespVO.class, vo ->
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
--
Gitblit v1.9.3