From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro

---
 src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index 09e265a..341026d 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -2,21 +2,23 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.production.bean.dto.ProductionProductMainDto;
 import com.ruoyi.production.service.ProductionProductMainService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@RequestMapping("productionProductMain")
+@RequestMapping("/productionProductMain")
 @RestController
-@Api(value = "鐢熶骇鎶ュ伐")
+@Tag(name = "鐢熶骇鎶ュ伐")
 @AllArgsConstructor
 public class ProductionProductMainController {
 
@@ -28,19 +30,19 @@
      * @param productionProductMainDto
      * @return
      */
-    @GetMapping("listPage")
+    @GetMapping("/listPage")
     public R page(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
         return R.ok(productionProductMainService.listPageProductionProductMainDto(page, productionProductMainDto));
     }
 
     @GetMapping("/page")
-    @ApiOperation("鐢熶骇鎶ュ伐鍒嗛〉鏌ヨ")
+    @Operation(summary = "鐢熶骇鎶ュ伐鍒嗛〉鏌ヨ")
     public R pageProductionProductMain(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
         return R.ok(productionProductMainService.pageProductionProductMain(page, productionProductMainDto));
     }
 
     @GetMapping("/{id}")
-    @ApiOperation("鐢熶骇鎶ュ伐璇︽儏")
+    @Operation(summary = "鐢熶骇鎶ュ伐璇︽儏")
     public R getInfo(@PathVariable("id") Long id) {
         return R.ok(productionProductMainService.getProductionProductMainInfo(id));
     }
@@ -50,31 +52,37 @@
      * @param productionProductMainDto
      * @return
      */
-    @PostMapping("addProductMain")
+    @Log(title = "鐢熶骇浜у搧", businessType = BusinessType.INSERT)
+    @PostMapping("/addProductMain")
+    @PreAuthorize("@ss.hasPermi('productionProductMain:add')")
     public R addProductMain(@RequestBody ProductionProductMainDto productionProductMainDto) {
         return R.ok(productionProductMainService.addProductMain(productionProductMainDto));
     }
 
+    @Log(title = "鐢熶骇浜у搧", businessType = BusinessType.INSERT)
     @PostMapping
-    @ApiOperation("鏂板鐢熶骇鎶ュ伐")
+    @Operation(summary = "鏂板鐢熶骇鎶ュ伐")
     public R add(@RequestBody ProductionProductMainDto productionProductMainDto) {
         return R.ok(productionProductMainService.saveProductionProductMain(productionProductMainDto));
     }
 
+    @Log(title = "鐢熶骇浜у搧", businessType = BusinessType.UPDATE)
     @PutMapping
-    @ApiOperation("淇敼鐢熶骇鎶ュ伐")
+    @Operation(summary = "淇敼鐢熶骇鎶ュ伐")
     public R edit(@RequestBody ProductionProductMainDto productionProductMainDto) {
         return R.ok(productionProductMainService.saveProductionProductMain(productionProductMainDto));
     }
 
-    @ApiOperation("鍒犻櫎鎶ュ伐")
+    @Log(title = "鐢熶骇浜у搧", businessType = BusinessType.DELETE)
+    @Operation(summary = "鍒犻櫎鎶ュ伐")
     @DeleteMapping("/delete")
     public R delete(@RequestBody ProductionProductMainDto productionProductMainDto) {
         return R.ok(productionProductMainService.removeProductMain(productionProductMainDto.getId()));
     }
 
+    @Log(title = "鐢熶骇浜у搧", businessType = BusinessType.DELETE)
     @DeleteMapping("/{id}")
-    @ApiOperation("鍒犻櫎鐢熶骇鎶ュ伐")
+    @Operation(summary = "鍒犻櫎鐢熶骇鎶ュ伐")
     public R remove(@PathVariable("id") Long id) {
         return R.ok(productionProductMainService.removeProductMain(id));
     }
@@ -83,6 +91,7 @@
     /**
      * 瀵煎嚭
      */
+    @Log(title = "鐢熶骇浜у搧", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ProductionProductMainDto productionProductMainDto) {
         List<ProductionProductMainDto> list;

--
Gitblit v1.9.3