From d86a37f36ec375f8aa3d3eaee18ea1ad323eba0b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 26 四月 2024 09:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index 1baa094..af6e52b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.dto.PageTestObjectDto;
+import com.yuanchu.mom.pojo.Product;
import com.yuanchu.mom.pojo.StructureItemParameter;
import com.yuanchu.mom.pojo.StructureTestObject;
import com.yuanchu.mom.service.CapacityScopeService;
+import com.yuanchu.mom.service.ProductService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
@@ -28,6 +30,8 @@
public class CapacityScopeController {
private CapacityScopeService capacityScopeService;
+
+ private ProductService productService;
@ApiOperation(value = "鑳藉姏鑼冨洿-鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
@PostMapping("/selectItemParameterList")
@@ -93,5 +97,42 @@
public Result getInsProduction(){
return Result.success(capacityScopeService.getInsProduction());
}
+
+ @ApiOperation(value = "缁存姢妫�楠屽璞＄殑浜у搧")
+ @PostMapping("/selectProductListByObjectId")
+ public Result selectProductListByObjectId(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ Product product = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Product.class);
+ return Result.success(productService.selectProductListByObjectId(page, product));
+ }
+
+ @ApiOperation(value = "娣诲姞浜у搧")
+ @PostMapping("/addProduct")
+ @ValueAuth
+ public Result addProduct(@RequestBody Product product) {
+ return Result.success(productService.addProduct(product));
+ }
+
+ @ApiOperation(value = "淇敼浜у搧")
+ @PostMapping("/upProduct")
+ @ValueAuth
+ public Result upProduct(@RequestBody Product product) {
+ return Result.success(productService.upProduct(product));
+ }
+
+ @ApiOperation(value = "鍒犻櫎浜у搧")
+ @PostMapping("/delProduct")
+ @ValueAuth
+ public Result delProduct(Integer id) {
+ return Result.success(productService.delProduct(id));
+ }
+
+ @ApiOperation(value = "鑾峰彇妫�楠屽璞℃爲")
+ @GetMapping("/getItemTree")
+ @ValueAuth
+ public Result getItemTree() {
+ return Result.success(capacityScopeService.getItemTree());
+ }
+
}
--
Gitblit v1.9.3