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/task/MesProTaskController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
index 7557506..149e109 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
@@ -73,6 +73,25 @@
public class MesProTaskController {
@Resource
+ private cn.iocoder.yudao.module.mes.service.pro.task.schedule.MesProBatchScheduleService batchScheduleService;
+
+ @PostMapping("/auto-schedule/preview")
+ @Operation(summary = "鎵归噺涓�閿帓浜ч瑙堬紙09鈥�18鐐癸紝鎺掗櫎鍛ㄦ湯鍜岃妭鍋囨棩锛�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:create')")
+ public CommonResult<cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProBatchSchedulePreviewRespVO> previewBatchSchedule(
+ @Valid @RequestBody cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProBatchScheduleReqVO request) {
+ return success(batchScheduleService.preview(request));
+ }
+
+ @PostMapping("/auto-schedule")
+ @Operation(summary = "纭鎵归噺涓�閿帓浜э紙閲嶆柊鏍￠獙棰勮锛屾暣鎵瑰師瀛愭彁浜わ級")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:create')")
+ public CommonResult<java.util.Map<String, Object>> executeBatchSchedule(
+ @Valid @RequestBody cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProBatchScheduleReqVO request) {
+ return success(java.util.Map.of("taskIds", batchScheduleService.execute(request)));
+ }
+
+ @Resource
private MesProTaskService taskService;
@Resource
private MesProWorkOrderService workOrderService;
@@ -118,7 +137,6 @@
@Parameter(name = "workstationId", description = "宸ヤ綔绔欑紪鍙�", required = true),
@Parameter(name = "quantity", description = "鎺掍骇鏁伴噺", required = true)
})
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<java.util.Map<String, Object>> calculateDuration(
@RequestParam("workstationId") Long workstationId,
@RequestParam("quantity") BigDecimal quantity) {
@@ -171,7 +189,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐢熶骇浠诲姟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<MesProTaskRespVO> getTask(@RequestParam("id") Long id) {
MesProTaskDO task = taskService.getTask(id);
if (task == null) {
@@ -182,7 +199,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐢熶骇浠诲姟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<PageResult<MesProTaskRespVO>> getTaskPage(@Valid MesProTaskPageReqVO pageReqVO) {
PageResult<MesProTaskDO> pageResult = taskService.getTaskPage(pageReqVO);
return success(new PageResult<>(buildTaskRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -190,7 +206,6 @@
@GetMapping("/pending-feedback-page")
@Operation(summary = "鑾峰緱寰呮姤宸ュ彴璐﹀垎椤�", description = "宸叉帓浜т笖浠嶆湁寰呮姤宸ユ暟閲忕殑浠诲姟锛堢姸鎬�=杩涜涓級")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<PageResult<MesProTaskRespVO>> getPendingFeedbackPage(@Valid MesProTaskPageReqVO pageReqVO) {
Long loginUserId = cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId();
// 濡傛灉褰撳墠鐧诲綍浜轰笉鏄秴绾х鐞嗗憳锛屽垯浠呮煡璇㈠垎閰嶇粰鑷繁鐨勭敓浜у伐鍗�
@@ -231,7 +246,6 @@
@GetMapping("/gantt-list")
@Operation(summary = "鑾峰緱鐢樼壒鍥句换鍔″垪琛�", description = "鍚庣缁勮宸ュ崟=project + 浠诲姟=task 鍒楄〃")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<List<GanttDataRespVO>> listGanttTaskList(@Valid MesProWorkOrderPageReqVO reqVO) {
// 1.1 鏌ヨ鍖归厤鐨勫伐鍗曪紙涓嶅垎椤碉級
reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
@@ -257,6 +271,7 @@
convertSet(allTasks, MesProTaskDO::getProcessId));
// 2.2 缁勮鐢樼壒鍥炬暟鎹�
List<GanttDataRespVO> ganttData = new java.util.ArrayList<>();
+ Set<Long> visibleWorkOrderIds = convertSet(workOrders, MesProWorkOrderDO::getId);
for (MesProWorkOrderDO workOrder : workOrders) {
// 2.2.a 宸ュ崟 -> project 琛�
MesMdItemDO item = itemMap.get(workOrder.getProductId());
@@ -270,7 +285,10 @@
.setQuantity(workOrder.getQuantity())
.setDuration(0L)
.setProgress(calcProgress(workOrder.getQuantityProduced(), workOrder.getQuantity()));
- if (ObjUtil.notEqual(workOrder.getParentId(), MesProWorkOrderDO.PARENT_ID_NULL)) {
+ if (workOrder.getParentId() != null
+ && !Objects.equals(workOrder.getParentId(), MesProWorkOrderDO.PARENT_ID_NULL)
+ && !Objects.equals(workOrder.getParentId(), workOrder.getId())
+ && visibleWorkOrderIds.contains(workOrder.getParentId())) {
woData.setParent(MesBizTypeConstants.PRO_WORKORDER + "_" + workOrder.getParentId());
}
ganttData.add(woData);
--
Gitblit v1.9.3