From bce822c1cb336db7dad14e7dbc12f5a8a0fd656b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 15 五月 2024 15:28:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 10f2aa9..d5ea19c 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
@@ -25,18 +26,21 @@
private StandardProductListService standardProductListService;
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "鑾峰彇鏍囧噯鏍�")
@GetMapping("/selectStandardTreeList")
public Result selectStandardTreeList(){
return Result.success(standardTreeService.selectStandardTreeList());
}
-
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "娣诲姞鏍囧噯鏍�")
@PostMapping("/addStandardTree")
public Result addStandardTree(@RequestBody StandardTree standardTree){
return Result.success(standardTreeService.addStandardTree(standardTree));
}
+ @ValueAuth
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
@PostMapping("/addStandardMethodList")
public Result addStandardMethodList(String tree, Integer standardId){
@@ -49,32 +53,36 @@
public Result selectsStandardMethodByFLSSM(String tree){
return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
}
-
- @ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勮姹傚��")
+ @ValueClassify("鏍囧噯搴�")
+ @ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勫唴瀹�")
@PostMapping("/upStandardProductList")
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")
public Result delStandardProductByIds(String ids){
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")
public Result delStandardTree(String tree){
@@ -91,8 +99,8 @@
@ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
@PostMapping("/selectStandardProductListByMethodId")
@ValueAuth
- public Result selectStandardProductListByMethodId(Integer id, String tree){
- return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
+ public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page){
+ return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
}
@ApiOperation(value = "鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇")
@@ -102,4 +110,11 @@
return Result.success(standardMethodListService.selectStandardMethodEnum());
}
+ @ApiOperation(value = "鑾峰彇浜у搧鏋舵瀯")
+ @GetMapping("/getStandardTree2")
+ @ValueAuth
+ public Result getStandardTree2(){
+ return Result.success(standardTreeService.getStandardTree2());
+ }
+
}
--
Gitblit v1.9.3