From 7523dab74d657143eea6683dee965f295b966f73 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 19 Jun 2024 16:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8D=95=E7=AE=A1=E7=90=86=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84@PreAuthorize=E6=9D=83=E9=99=90=E4=B8=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/plan/PlanController.java    | 16 ++++++++--------
 .../admin/plate/RemainPlateController.java       |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java
index 23175db65..f19e7e73d 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java
@@ -37,14 +37,14 @@ public class PlanController {
 
     @PostMapping("/create")
     @Operation(summary = "创建排单")
-    @PreAuthorize("@ss.hasPermission('executor:plan:create')")
+    @PreAuthorize("@ss.hasPermission('placeorder:create')")
     public CommonResult<Long> createPlan(@Validated(CreateGroup.class) @RequestBody PlanSaveReqVO createReqVO) {
         return success(planService.createPlan(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新排单")
-    @PreAuthorize("@ss.hasPermission('executor:plan:update')")
+    @PreAuthorize("@ss.hasPermission('placeorder:update')")
     public CommonResult<Boolean> updatePlan(@Validated(UpdateGroup.class) @RequestBody PlanSaveReqVO updateReqVO) {
         planService.updatePlan(updateReqVO);
         return success(true);
@@ -53,7 +53,7 @@ public class PlanController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除排单")
     @Parameter(name = "id", description = "排单id", required = true)
-    @PreAuthorize("@ss.hasPermission('executor:plan:delete')")
+    @PreAuthorize("@ss.hasPermission('placeorder:delete')")
     public CommonResult<Boolean> deletePlan(@RequestParam("id") Long id) {
         return success(planService.deletePlan(id));
     }
@@ -70,7 +70,7 @@ public class PlanController {
     @GetMapping("/get")
     @Operation(summary = "获得排单")
     @Parameter(name = "id", description = "排单id", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('executor:plan:query')")
+    @PreAuthorize("@ss.hasPermission('placeorder:query')")
     public CommonResult<PlanRespVO> getPlan(@RequestParam("id") Long id) {
         PlanRespVO plan = planService.getPlan(id);
         return success(BeanUtils.toBean(plan, PlanRespVO.class));
@@ -85,14 +85,14 @@ public class PlanController {
 
     @GetMapping("getOrderByPlan")
     @Operation(summary = "根据排单获取生产单分页")
-    @PreAuthorize("@ss.hasPermission('executor:plan:query')")
+    @PreAuthorize("@ss.hasPermission('placeorder:orderlist')")
     public CommonResult<PageResult<OrderRespVO>> getOrderByPlanId(@Valid PlanOrderPageReqVO pageReqVO) {
         return success(planService.getOrderByPlanId(pageReqVO));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得排单分页")
-    @PreAuthorize("@ss.hasPermission('executor:plan:query')")
+    @PreAuthorize("@ss.hasPermission('placeorder:query')")
     public CommonResult<PageResult<PlanRespVO>> getPlanPage(@Valid PlanPageReqVO pageReqVO) {
         PageResult<PlanRespVO> pageResult = planService.getPlanPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, PlanRespVO.class));
@@ -100,14 +100,14 @@ public class PlanController {
 
     @PostMapping("/setSort")
     @Operation(summary = "设置排单优先级")
-    @PreAuthorize("@ss.hasPermission('executor:plan:query')")
+    @PreAuthorize("@ss.hasPermission('placeorder:priority')")
     public CommonResult<Boolean> setSort(@Valid  @NotEmpty(message = "参数不能空") @RequestBody List<SortVO> list) {
         return success(planService.setSort(list));
     }
 
     @GetMapping("getNotPlanOrderListPage")
     @Operation(summary = "获取未排单的板材生产单板材分页列表")
-    @PreAuthorize("@ss.hasPermission('executor:plan:query')")
+    @PreAuthorize("@ss.hasPermission('placeorder:query')")
     public CommonResult<PageResult<OrderRespVOCopy>> getOrderPage(@Valid OrderPageReqVOCopy pageReqVO) {
         return success(planService.getOrderPage(pageReqVO));
     }
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java
index e2a61cf88..1d41fb990 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java
@@ -102,7 +102,7 @@ public class RemainPlateController {
 
     @GetMapping("/page")
     @Operation(summary = "获得生产单余料板表分页")
-    @PreAuthorize("@ss.hasPermission('manage:remain-plate:query')")
+    @PreAuthorize("@ss.hasPermission('placeorder:remain')")
     public CommonResult<PageResult<RemainPlateRespVO>> getRemainPlatePage(@Valid RemainPlatePageReqVO pageReqVO) {
         PageResult<RemainPlateDO> pageResult = remainPlateService.getRemainPlatePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, RemainPlateRespVO.class));