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/route/MesProRouteProcessController.java | 86 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
index 1bc0813..e7a153e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
@@ -6,15 +6,25 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProProcessBomItemVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProRouteProcessOutputVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProRouteProcessRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProRouteProcessSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessOutputDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductBomDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProductService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -43,6 +53,14 @@
private MesProProcessService processService;
@Resource
private MesMdItemService mdItemService;
+ @Resource
+ private MesProRouteProductService routeProductService;
+ @Resource
+ private MesWmWarehouseService warehouseService;
+ @Resource
+ private MesWmWarehouseLocationService warehouseLocationService;
+ @Resource
+ private MesWmWarehouseAreaService warehouseAreaService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓宸ヨ壓璺嚎宸ュ簭")
@@ -71,7 +89,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱宸ヨ壓璺嚎宸ュ簭")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-route:query')")
public CommonResult<MesProRouteProcessRespVO> getRouteProcess(@RequestParam("id") Long id) {
MesProRouteProcessDO routeProcess = routeProcessService.getRouteProcess(id);
return success(buildRouteProcessRespVO(routeProcess));
@@ -80,7 +97,6 @@
@GetMapping("/list-by-product")
@Operation(summary = "鎸変骇鍝佽幏寰楀伐搴忓垪琛�", description = "鏍规嵁浜у搧鏌ユ壘鍏宠仈鐨勫伐鑹鸿矾绾匡紝杩斿洖璇ヨ矾绾跨殑宸ュ簭鍒楄〃锛堝惈鍚勫伐搴忕殑鎶曟枡BOM锛�")
@Parameter(name = "productId", description = "浜у搧缂栧彿", required = true, example = "1")
- @PreAuthorize("@ss.hasPermission('mes:pro-route:query')")
public CommonResult<List<MesProRouteProcessRespVO>> getRouteProcessListByProduct(@RequestParam("productId") Long productId) {
List<MesProRouteProcessDO> list = routeProcessService.getRouteProcessListByProductId(productId);
List<MesProRouteProcessRespVO> result = buildRouteProcessRespVOList(list);
@@ -111,13 +127,40 @@
}
}
}
+ // 濉厖宸ヨ壓璺嚎浜у搧涓婇厤缃殑榛樿鎶ュ伐浠撳簱锛堜笅鍗曟椂浣滀负宸ュ簭榛樿鍊硷級
+ fillDefaultOutputWarehouse(result, productId);
return success(result);
+ }
+
+ private void fillDefaultOutputWarehouse(List<MesProRouteProcessRespVO> list, Long productId) {
+ if (CollUtil.isEmpty(list)) {
+ return;
+ }
+ MesProRouteProductDO routeProduct = routeProductService.getRouteProductByItemId(productId);
+ if (routeProduct == null || routeProduct.getWarehouseId() == null) {
+ return;
+ }
+ MesWmWarehouseDO warehouse = warehouseService.getWarehouse(routeProduct.getWarehouseId());
+ MesWmWarehouseLocationDO location = routeProduct.getLocationId() != null
+ ? warehouseLocationService.getWarehouseLocation(routeProduct.getLocationId()) : null;
+ MesWmWarehouseAreaDO area = routeProduct.getAreaId() != null
+ ? warehouseAreaService.getWarehouseArea(routeProduct.getAreaId()) : null;
+ String warehouseName = warehouse != null ? warehouse.getName() : null;
+ String locationName = location != null ? location.getName() : null;
+ String areaName = area != null ? area.getName() : null;
+ for (MesProRouteProcessRespVO vo : list) {
+ vo.setWarehouseId(routeProduct.getWarehouseId());
+ vo.setWarehouseName(warehouseName);
+ vo.setLocationId(routeProduct.getLocationId());
+ vo.setLocationName(locationName);
+ vo.setAreaId(routeProduct.getAreaId());
+ vo.setAreaName(areaName);
+ }
}
@GetMapping("/list-by-route")
@Operation(summary = "鎸夊伐鑹鸿矾绾胯幏寰楀伐搴忓垪琛�")
@Parameter(name = "routeId", description = "宸ヨ壓璺嚎缂栧彿", required = true, example = "1")
- @PreAuthorize("@ss.hasPermission('mes:pro-route:query')")
public CommonResult<List<MesProRouteProcessRespVO>> getRouteProcessListByRoute(@RequestParam("routeId") Long routeId) {
List<MesProRouteProcessDO> list = routeProcessService.getRouteProcessListByRouteId(routeId);
return success(buildRouteProcessRespVOList(list));
@@ -127,7 +170,6 @@
@Operation(summary = "鎸夊伐鑹鸿矾绾�+宸ュ簭鑾峰緱宸ュ簭閰嶇疆")
@Parameter(name = "routeId", description = "宸ヨ壓璺嚎缂栧彿", required = true, example = "1")
@Parameter(name = "processId", description = "宸ュ簭缂栧彿", required = true, example = "1")
- @PreAuthorize("@ss.hasPermission('mes:pro-route:query')")
public CommonResult<MesProRouteProcessRespVO> getRouteProcessByRouteAndProcess(
@RequestParam("routeId") Long routeId,
@RequestParam("processId") Long processId) {
@@ -161,6 +203,41 @@
}
Map<Long, MesMdItemDO> outputItemMap = allOutputItemIds.isEmpty()
? Collections.emptyMap() : mdItemService.getItemMap(allOutputItemIds);
+ // 2.1 浜у嚭褰掑睘閰嶇疆锛坧roductId 涓虹┖琛ㄧず澶氫骇鍝侀�氱敤锛�
+ Map<Long, List<MesProRouteProcessOutputVO>> outputsByRouteProcessId = new HashMap<>();
+ Set<Long> routeProcessIds = convertSet(list, MesProRouteProcessDO::getId);
+ routeProcessIds.removeAll(Collections.singleton(null));
+ if (CollUtil.isNotEmpty(routeProcessIds)) {
+ List<MesProRouteProcessOutputDO> outputList = routeProcessService
+ .getRouteProcessOutputListByRouteProcessIds(routeProcessIds);
+ if (CollUtil.isNotEmpty(outputList)) {
+ Set<Long> ownerItemIds = new HashSet<>();
+ outputList.forEach(output -> {
+ if (output.getProductId() != null) {
+ ownerItemIds.add(output.getProductId());
+ }
+ if (output.getItemId() != null) {
+ ownerItemIds.add(output.getItemId());
+ }
+ });
+ Map<Long, MesMdItemDO> ownerItemMap = mdItemService.getItemMap(ownerItemIds);
+ for (MesProRouteProcessOutputDO output : outputList) {
+ MesProRouteProcessOutputVO outputVO = new MesProRouteProcessOutputVO();
+ outputVO.setId(output.getId());
+ outputVO.setRouteProcessId(output.getRouteProcessId());
+ outputVO.setProductId(output.getProductId());
+ outputVO.setItemId(output.getItemId());
+ outputVO.setSort(output.getSort());
+ outputVO.setRemark(output.getRemark());
+ MapUtils.findAndThen(ownerItemMap, output.getItemId(),
+ item -> outputVO.setItemCode(item.getCode()).setItemName(item.getName()));
+ MapUtils.findAndThen(ownerItemMap, output.getProductId(),
+ product -> outputVO.setProductName(product.getName()));
+ outputsByRouteProcessId.computeIfAbsent(output.getRouteProcessId(),
+ key -> new ArrayList<>()).add(outputVO);
+ }
+ }
+ }
// 3. 鎷兼帴 VO
List<MesProRouteProcessRespVO> result = BeanUtils.toBean(list, MesProRouteProcessRespVO.class);
for (int i = 0; i < result.size(); i++) {
@@ -188,6 +265,7 @@
vo.setOutputItemName(firstItem.getName());
}
}
+ vo.setOutputs(outputsByRouteProcessId.getOrDefault(vo.getId(), Collections.emptyList()));
}
return result;
}
--
Gitblit v1.9.3