From 8ce50189f0b00d62390d67fd27f859ca7831616b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 17:32:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index d718001..52d84ba 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -11,13 +11,19 @@
 import com.yuanchu.mom.service.StandardProductListService;
 import com.yuanchu.mom.service.StandardTreeService;
 import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 @RestController
 @AllArgsConstructor
 @RequestMapping("/standardTree")
+@Api(tags="鏍囧噯搴�")
 public class StandardTreeController {
 
     private StandardTreeService standardTreeService;
@@ -25,7 +31,8 @@
     private StandardMethodListService standardMethodListService;
 
     private StandardProductListService standardProductListService;
-    @ValueAuth
+
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鑾峰彇鏍囧噯鏍�")
     @GetMapping("/selectStandardTreeList")
     public Result selectStandardTreeList(){
@@ -37,6 +44,8 @@
     public Result addStandardTree(@RequestBody StandardTree standardTree){
         return Result.success(standardTreeService.addStandardTree(standardTree));
     }
+
+    @ValueAuth
     @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
     @PostMapping("/addStandardMethodList")
@@ -56,12 +65,14 @@
     public Result upStandardProductList(@RequestBody StandardProductList list){
         return Result.success(standardProductListService.upStandardProductList(list));
     }
+    @ValueAuth
     @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�")
     @PostMapping("/delStandardMethodByFLSSM")
     public Result delStandardMethodByFLSSM(Integer id){
         return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
     }
+    @ValueAuth
     @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
     @PostMapping("/delStandardProductByIds")
@@ -69,12 +80,14 @@
         JSONArray lists = JSON.parseArray(ids);
         return Result.success(standardProductListService.delStandardProduct(lists));
     }
+    @ValueAuth
     @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
     @PostMapping("/addStandardProduct")
     public Result addStandardProduct(String ids, String tree){
         return Result.success(standardTreeService.addStandardProduct(ids, tree));
     }
+
     @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
     @PostMapping("/delStandardTree")
@@ -96,6 +109,20 @@
         return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
     }
 
+    @ApiOperation(value = "鎵归噺缂栬緫鏌ヨ妫�楠岄」鐩�")
+    @PostMapping("/selectStandardProductByMethodId")
+    @ValueAuth
+    public Result selectStandardProductByMethodId(Integer id, String tree, Integer page,String laboratory,String item,String items){
+        return Result.success(standardProductListService.selectStandardProductByMethodId(id, tree, page, laboratory, item, items));
+    }
+
+    @ApiOperation(value = "鎵归噺缂栬緫鏌ヨ鎵�鏈夋楠岄」鐩拰妫�楠屽瓙椤规灇涓�")
+    @PostMapping("/selectStandardProductEnumByMethodId")
+    @ValueAuth
+    public Result selectStandardProductEnumByMethodId(Integer id, String tree){
+        return Result.success(standardProductListService.selectStandardProductEnumByMethodId(id, tree));
+    }
+
     @ApiOperation(value = "鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇")
     @GetMapping("/selectStandardMethodEnum")
     @ValueAuth
@@ -110,4 +137,14 @@
         return Result.success(standardTreeService.getStandardTree2());
     }
 
+    @ValueClassify("鏍囧噯搴�")
+    @ApiOperation(value = "鎵归噺淇敼椤圭洰鍐呭")
+    @PostMapping("/upStandardProducts")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "standardProductList",dataTypeClass = StandardProductList.class),
+            @ApiImplicitParam(name = "ids",dataTypeClass = Integer.class)
+    })
+    public Result upStandardProducts(@RequestBody Map<String, Object> product){
+        return Result.success(standardTreeService.upStandardProducts(product));
+    }
 }

--
Gitblit v1.9.3