From f284c5ef6a1aa6e9ba5d4e94e4b2abe83b6ea18c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 14:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
index e2ca4c8..428d483 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -8,14 +8,17 @@
 import com.ycl.system.Result;
 import com.ycl.system.domain.group.Add;
 import com.ycl.system.domain.group.Update;
+import com.ycl.utils.PageUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 宸ュ崟 鍓嶇鎺у埗鍣�
@@ -34,20 +37,30 @@
 
     @PostMapping
     @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+    @PreAuthorize("@ss.hasPermi('work:order:add')")
     public Result add(@RequestBody @Validated(Add.class) WorkOrderForm form) {
         return workOrderService.add(form);
     }
 
     @PutMapping
     @ApiOperation(value = "淇敼", notes = "淇敼")
+    @PreAuthorize("@ss.hasPermi('work:order:edit')")
     public Result update(@RequestBody @Validated(Update.class) WorkOrderForm form) {
         return workOrderService.update(form);
     }
 
     @PutMapping("/auditing")
     @ApiOperation(value = "瀹℃牳", notes = "宸ュ崟瀹℃牳")
+    @PreAuthorize("@ss.hasPermi('work:order:audit')")
     public Result auditing(@RequestBody @Validated(Update.class) WorkOrderAuditingForm form) {
         return workOrderService.auditing(form);
+    }
+
+    @PutMapping("/batchAuditing")
+    @ApiOperation(value = "瀹℃牳", notes = "宸ュ崟鎵归噺瀹℃牳")
+    @PreAuthorize("@ss.hasPermi('work:order:audit')")
+    public Result batchAuditing(@RequestBody @Validated(Update.class) WorkOrderBatchAuditingForm form) {
+        return workOrderService.batchAuditing(form);
     }
 
     @PutMapping("/yw-condition")
@@ -58,14 +71,8 @@
 
     @GetMapping("/yw-condition/{id}")
     @ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
-    public Result ywCondition(@PathVariable @Validated(Update.class) String id) {
+    public Result ywCondition(@PathVariable Integer id) {
         return workOrderService.selectYwConditionByYwId(id);
-    }
-
-    @GetMapping("/yw-condition-list/{id}")
-    @ApiOperation(value = "杩愮淮鎯呭喌璁板綍", notes = "杩愮淮鎯呭喌璁板綍")
-    public Result ywConditionList(@PathVariable @Validated(Update.class) String id) {
-        return workOrderService.selectYwConditionListByYwId(id);
     }
 
     @GetMapping("/yw-auditing-list/{id}")
@@ -88,48 +95,56 @@
 
     @DeleteMapping("/{id}")
     @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+    @PreAuthorize("@ss.hasPermi('work:order:remove')")
     public Result removeById(@PathVariable("id") String id) {
         return workOrderService.removeById(id);
     }
 
     @DeleteMapping("/batch")
     @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+    @PreAuthorize("@ss.hasPermi('work:order:remove')")
     public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
         return workOrderService.remove(ids);
     }
 
     @PostMapping("/page")
     @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+    @PreAuthorize("@ss.hasPermi('work:order:page')")
     public Result page(@RequestBody WorkOrderQuery query) {
         return workOrderService.page(query);
     }
 
     @PostMapping("/distribute/page")
     @ApiOperation(value = "涓嬪彂鍒嗛〉", notes = "涓嬪彂鍒嗛〉")
+    @PreAuthorize("@ss.hasPermi('work:order:distribute')")
     public Result distributePage(@RequestBody DistributeWorkOrderQuery query) {
         return workOrderService.distributePage(query);
     }
 
     @PostMapping("/distribute/fast")
     @ApiOperation(value = "蹇�熶笅鍙�", notes = "蹇�熶笅鍙�")
+    @PreAuthorize("@ss.hasPermi('work:order:distribute')")
     public Result distributeFast(@RequestBody @Validated DistributeWorkOrderVO data) {
         return workOrderService.distributeFast(data);
     }
 
     @PostMapping("/distribute/ids")
     @ApiOperation(value = "涓嬪彂閫夋嫨", notes = "涓嬪彂閫夋嫨")
-    public Result selectedIdsDistribute(@RequestBody List<Integer> ids, @RequestParam("unitId") Integer unitId) {
-        return workOrderService.selectedIdsDistribute(ids, unitId);
+    @PreAuthorize("@ss.hasPermi('work:order:distribute')")
+    public Result selectedIdsDistribute(@RequestBody DistributeWorkOrderQuery query) {
+        return workOrderService.selectedIdsDistribute(query);
     }
 
     @GetMapping("/{id}")
     @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+    @PreAuthorize("@ss.hasPermi('work:order:query')")
     public Result detail(@PathVariable("id") String id) {
         return workOrderService.detail(id);
     }
 
     @GetMapping("/list")
     @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+    @PreAuthorize("@ss.hasPermi('work:order:list')")
     public Result list() {
         return workOrderService.all();
     }

--
Gitblit v1.8.0