From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index 2dc751e..341026d 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -2,19 +2,21 @@
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.v3.oas.annotations.tags.Tag;
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
@Tag(name = "鐢熶骇鎶ュ伐")
@AllArgsConstructor
@@ -28,7 +30,7 @@
* @param productionProductMainDto
* @return
*/
- @GetMapping("listPage")
+ @GetMapping("/listPage")
public R page(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.listPageProductionProductMainDto(page, productionProductMainDto));
}
@@ -50,29 +52,35 @@
* @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
@Operation(summary = "鏂板鐢熶骇鎶ュ伐")
public R add(@RequestBody ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.saveProductionProductMain(productionProductMainDto));
}
+ @Log(title = "鐢熶骇浜у搧", businessType = BusinessType.UPDATE)
@PutMapping
@Operation(summary = "淇敼鐢熶骇鎶ュ伐")
public R edit(@RequestBody ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.saveProductionProductMain(productionProductMainDto));
}
+ @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}")
@Operation(summary = "鍒犻櫎鐢熶骇鎶ュ伐")
public R remove(@PathVariable("id") Long 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