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 |   73 +++++++++++++++++++++++++++++++-----
 1 files changed, 63 insertions(+), 10 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 44ce47e..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
@@ -1,12 +1,13 @@
 package com.yuanchu.mom.controller;
 
-
-
 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;
@@ -30,7 +31,9 @@
 
     private CapacityScopeService capacityScopeService;
 
-    @ApiOperation(value = "鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
+    private ProductService productService;
+
+    @ApiOperation(value = "鑳藉姏鑼冨洿-鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
     @PostMapping("/selectItemParameterList")
     public Result selectItemParameterList(@RequestBody Map<String, Object> data) throws Exception {
         Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -38,25 +41,25 @@
         return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
     }
 
-    @ApiOperation(value = "娣诲姞椤圭洰妫�楠屽弬鏁�")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-娣诲姞椤圭洰妫�楠屽弬鏁�")
     @PostMapping("/addItemParameter")
     public Result addItemParameter(@RequestBody StructureItemParameter itemParameter) {
         return Result.success(capacityScopeService.addItemParameter(itemParameter));
     }
 
-    @ApiOperation(value = "鍒犻櫎椤圭洰妫�楠屽弬鏁�")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-鍒犻櫎椤圭洰妫�楠屽弬鏁�")
     @PostMapping("/delItemParameter")
     public Result<?> delItemParameter(Integer id) {
         return Result.success(capacityScopeService.delItemParameter(id));
     }
 
-    @ApiOperation(value = "淇敼椤圭洰妫�楠屽弬鏁�")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-淇敼椤圭洰妫�楠屽弬鏁�")
     @PostMapping("/upItemParameter")
     public Result<?> upItemParameter(@RequestBody StructureItemParameter itemParameter) {
         return Result.success(capacityScopeService.upItemParameter(itemParameter));
     }
 
-    @ApiOperation(value = "鑾峰彇妫�楠屽璞�")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-鑾峰彇妫�楠屽璞�")
     @PostMapping("/selectTestObjectList")
     public Result selectTestObjectList(@RequestBody Map<String, Object> data) throws Exception {
         Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -64,22 +67,72 @@
         return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
     }
 
-    @ApiOperation(value = "娣诲姞妫�楠屽璞�")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-娣诲姞妫�楠屽璞�")
     @PostMapping("/addTestObject")
     public Result addTestObject(@RequestBody StructureTestObject testObject) {
         return Result.success(capacityScopeService.addTestObject(testObject));
     }
 
-    @ApiOperation(value = "鍒犻櫎妫�楠屽璞�")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-鍒犻櫎妫�楠屽璞�")
     @PostMapping("/delTestObject")
     public Result<?> delTestObject(Integer id) {
         return Result.success(capacityScopeService.delTestObject(id));
     }
 
-    @ApiOperation(value = "淇敼妫�楠屽璞�")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-淇敼妫�楠屽璞�")
     @PostMapping("/upTestObject")
     public Result upTestObject(@RequestBody StructureTestObject testObject) {
         return Result.success(capacityScopeService.upTestObject(testObject));
     }
+
+    @ApiOperation(value = "鑳藉姏鑼冨洿-鑾峰彇妫�楠屽璞℃灇涓�")
+    @GetMapping("/selectTestObjectByName")
+    @ValueAuth
+    public Result selectTestObjectByName() {
+        return Result.success(capacityScopeService.selectTestObjectByName());
+    }
+
+    @ApiOperation(value = "鑳藉姏鑼冨洿-璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)")
+    @PostMapping("/getInsProduction")
+    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