From ce10da906c58596fce43bffa6a6d177268ca177b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 30 四月 2024 00:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java |   42 ++++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 20 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 6e1b9ee..513b097 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
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
 import com.yuanchu.mom.dto.PageTestObjectDto;
 import com.yuanchu.mom.pojo.Product;
 import com.yuanchu.mom.pojo.StructureItemParameter;
@@ -32,72 +33,72 @@
     private CapacityScopeService capacityScopeService;
 
     private ProductService productService;
-
-    @ApiOperation(value = "鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
+    @ValueClassify("鑳藉姏鑼冨洿")
+    @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);
         StructureItemParameter itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), StructureItemParameter.class);
         return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
     }
-
-    @ApiOperation(value = "娣诲姞椤圭洰妫�楠屽弬鏁�")
+    @ValueClassify("鑳藉姏鑼冨洿")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-娣诲姞椤圭洰妫�楠屽弬鏁�")
     @PostMapping("/addItemParameter")
     public Result addItemParameter(@RequestBody StructureItemParameter itemParameter) {
         return Result.success(capacityScopeService.addItemParameter(itemParameter));
     }
-
-    @ApiOperation(value = "鍒犻櫎椤圭洰妫�楠屽弬鏁�")
+    @ValueClassify(value="鑳藉姏鑼冨洿")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-鍒犻櫎椤圭洰妫�楠屽弬鏁�")
     @PostMapping("/delItemParameter")
     public Result<?> delItemParameter(Integer id) {
         return Result.success(capacityScopeService.delItemParameter(id));
     }
-
-    @ApiOperation(value = "淇敼椤圭洰妫�楠屽弬鏁�")
+    @ValueClassify(value="鑳藉姏鑼冨洿")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-淇敼椤圭洰妫�楠屽弬鏁�")
     @PostMapping("/upItemParameter")
     public Result<?> upItemParameter(@RequestBody StructureItemParameter itemParameter) {
         return Result.success(capacityScopeService.upItemParameter(itemParameter));
     }
-
-    @ApiOperation(value = "鑾峰彇妫�楠屽璞�")
+    @ValueClassify(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);
         PageTestObjectDto pageTestObjectDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), PageTestObjectDto.class);
         return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
     }
-
-    @ApiOperation(value = "娣诲姞妫�楠屽璞�")
+    @ValueClassify(value="鑳藉姏鑼冨洿")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-娣诲姞妫�楠屽璞�")
     @PostMapping("/addTestObject")
     public Result addTestObject(@RequestBody StructureTestObject testObject) {
         return Result.success(capacityScopeService.addTestObject(testObject));
     }
-
-    @ApiOperation(value = "鍒犻櫎妫�楠屽璞�")
+    @ValueClassify(value="鑳藉姏鑼冨洿")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-鍒犻櫎妫�楠屽璞�")
     @PostMapping("/delTestObject")
     public Result<?> delTestObject(Integer id) {
         return Result.success(capacityScopeService.delTestObject(id));
     }
-
-    @ApiOperation(value = "淇敼妫�楠屽璞�")
+    @ValueClassify(value="鑳藉姏鑼冨洿")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-淇敼妫�楠屽璞�")
     @PostMapping("/upTestObject")
     public Result upTestObject(@RequestBody StructureTestObject testObject) {
         return Result.success(capacityScopeService.upTestObject(testObject));
     }
 
-    @ApiOperation(value = "鑾峰彇妫�楠屽璞℃灇涓�")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-鑾峰彇妫�楠屽璞℃灇涓�")
     @GetMapping("/selectTestObjectByName")
     @ValueAuth
     public Result selectTestObjectByName() {
         return Result.success(capacityScopeService.selectTestObjectByName());
     }
-
-    @ApiOperation(value = "璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)")
+    @ValueClassify(value="鑳藉姏鑼冨洿")
+    @ApiOperation(value = "鑳藉姏鑼冨洿-璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)")
     @PostMapping("/getInsProduction")
     public Result getInsProduction(){
         return Result.success(capacityScopeService.getInsProduction());
     }
-
+    @ValueClassify(value="鑳藉姏鑼冨洿")
     @ApiOperation(value = "缁存姢妫�楠屽璞$殑浜у搧")
     @PostMapping("/selectProductListByObjectId")
     public Result selectProductListByObjectId(@RequestBody Map<String, Object> data) throws Exception {
@@ -106,6 +107,7 @@
         return Result.success(productService.selectProductListByObjectId(page, product));
     }
 
+
     @ApiOperation(value = "娣诲姞浜у搧")
     @PostMapping("/addProduct")
     @ValueAuth

--
Gitblit v1.9.3