From 8b1691efd59291b618974a8cb77f6491245e16e2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 14 四月 2025 11:10:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
index 420402c..9c108f4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
@@ -1,28 +1,78 @@
package com.example.erp.controller.sd;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.Product;
import com.example.erp.service.sd.ProductService;
-import org.apache.ibatis.annotations.Delete;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@RestController
+@Api(value="浜у搧controller",tags={"浜у搧鎿嶄綔鎺ュ彛"})
@RequestMapping("/product")
public class ProductController {
- @Autowired
+ final
ProductService productService;
- @PostMapping ("/{pageNum}/{pageSize}/{glassType}")
- public Result defaultDateProduct(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> glassType, @RequestBody Product product){
- return Result.seccess(productService.defaultDateProduct(pageNum,pageSize,glassType,product));
+ public ProductController(ProductService productService) {
+ this.productService = productService;
}
+ @ApiOperation("浜у搧鏌ヨ鎺ュ彛")
+ @SaCheckPermission("selectProduct.search")
+ @PostMapping ("/{pageNum}/{pageSize}/{glassType}")
+ public Result defaultDateProduct(@PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> glassType,
+ @RequestBody Product product){
+ return Result.seccess(productService.defaultDateProduct(pageNum,pageSize,glassType,product));
+ }
+ @ApiOperation("鍏朵粬绯荤粺鑾峰彇浜у搧鏌ヨ鎺ュ彛")
+ @PostMapping("/otherSysGetProduct")
+ public Result otherSysGetProduct(){
+ return Result.seccess(productService.otherSysGetProduct());
+ }
+
+ @ApiOperation("浜у搧淇濆瓨鎺ュ彛")
+ @SaCheckPermission("createProduct.add")
@PostMapping("/saveProduct")
public Result saveProduct(@RequestBody Map<String,Object> product){
return Result.seccess(productService.saveProduct(product));
}
+ @ApiOperation("鍏朵粬绯荤粺浜у搧淇濆瓨鎺ュ彛")
+ @PostMapping("/otherSysSaveProduct")
+ public Result otherSysSaveProduct(@RequestBody Map<String,Object> product){
+ return Result.seccess(productService.saveProduct(product));
+ }
+
+ @ApiOperation("浜у搧鏌ラ噸鎺ュ彛")
+ @SaCheckPermission("createProduct.add")
+ @PostMapping("/selectProduct/{productName}")
+ public Result selectProduct(@PathVariable String productName,@RequestBody Map<String,Object> product){
+ return Result.seccess(productService.selectProduct(productName,product));
+ }
+
+ @ApiOperation("浜у搧鍒犻櫎鎺ュ彛")
+ @SaCheckPermission("selectProduct.delete")
+ @PostMapping("/deleteProductById/{id}")
+ public Result deleteProductById(@PathVariable Integer id){
+ return Result.seccess(productService.deleteProductById(id));
+ }
+
+ @ApiOperation("浜у搧瀹℃牳鐘舵�佷慨鏀规帴鍙�")
+ @SaCheckPermission("createProduct.review")
+ @PostMapping("/updateProductStateById/{id}/{state}")
+ public Result updateProductStateById(@PathVariable Integer id,@PathVariable Integer state){
+ return Result.seccess(productService.updateProductStateById(id,state));
+ }
+ @ApiOperation("鏍规嵁浜у搧id鏌ヨ浜у搧鎺ュ彛")
+ @SaCheckPermission("selectProduct.edit")
+ @PostMapping("/selectProductById/{id}")
+ public Result selectProductById(@PathVariable Integer id){
+ return Result.seccess(productService.selectProductById(id));
+ }
}
--
Gitblit v1.8.0