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 | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 109 insertions(+), 5 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 7af0d43..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
@@ -1,36 +1,52 @@
package com.yuanchu.mom.controller;
-import cn.hutool.core.util.ObjectUtil;
+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;
import com.yuanchu.mom.service.StandardMethodListService;
+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;
private StandardMethodListService standardMethodListService;
+ 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){
- if(standardTree.getModel().equals("")) standardTree.setModel(null);
return Result.success(standardTreeService.addStandardTree(standardTree));
}
+ @ValueAuth
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
@PostMapping("/addStandardMethodList")
public Result addStandardMethodList(String tree, Integer standardId){
@@ -39,8 +55,96 @@
@ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�")
@PostMapping("/selectsStandardMethodByFLSSM")
- public Result selectsStandardMethodByFLSSM(){
- return Result.success();
+ @ValueAuth
+ public Result selectsStandardMethodByFLSSM(String tree){
+ return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
+ }
+ @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){
+ return Result.success(standardTreeService.delStandardTree(tree));
+ }
+
+ @ApiOperation(value = "閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�")
+ @PostMapping("/selectStandardProductList")
+ @ValueAuth
+ public Result selectStandardProductList(@RequestBody InsSample insSample){
+ return Result.success(standardProductListService.selectStandardProductList(insSample));
+ }
+
+ @ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
+ @PostMapping("/selectStandardProductListByMethodId")
+ @ValueAuth
+ public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page){
+ 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
+ public Result selectStandardMethodEnum(){
+ return Result.success(standardMethodListService.selectStandardMethodEnum());
+ }
+
+ @ApiOperation(value = "鑾峰彇浜у搧鏋舵瀯")
+ @GetMapping("/getStandardTree2")
+ @ValueAuth
+ public Result getStandardTree2(){
+ 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