From 934f0bc7c1f73674fbbfd2301425a14087c09eac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 06 三月 2025 15:58:45 +0800
Subject: [PATCH] 能力范围调整
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 149 +++++++++++--------------------------------------
1 files changed, 33 insertions(+), 116 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index d24ae09..e25a8b9 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -2,17 +2,12 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.basic.dto.CopyStandardProductListDto;
-import com.ruoyi.basic.dto.FactoryDto;
-import com.ruoyi.basic.dto.InsSampleReceiveDto;
-import com.ruoyi.basic.dto.ResetTreeDragDTO;
+import com.ruoyi.basic.pojo.InsSample1;
import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardMethodListService;
+import com.ruoyi.common.core.domain.Result;
import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StandardProductListSupplierAskService;
import com.ruoyi.basic.service.StandardTreeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -22,7 +17,6 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import java.util.List;
import java.util.Map;
@RestController
@@ -37,9 +31,7 @@
private StandardProductListService standardProductListService;
- private StandardProductListSupplierAskService standardProductListSupplierAskService;
-
- @ApiOperation(value = "鑾峰彇鏍囧噯鏍�")
+ @ApiOperation(value = "鏌ョ湅鏍囧噯搴撳垪琛�")
@GetMapping("/selectStandardTreeList")
public Result selectStandardTreeList() {
return Result.success(standardTreeService.selectStandardTreeList());
@@ -59,38 +51,34 @@
@ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
@PostMapping("/addStandardMethodList")
- public Result addStandardMethodList(String tree, Integer standardId) {
+ public Result addStandardMethodList(@RequestBody Map<String,Object> map) {
+ Integer standardId =(Integer) map.get("standardId");
+ String tree =(String) map.get("tree");
return Result.success(standardMethodListService.addStandardMethodList(standardId, tree));
}
@ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�")
- @PostMapping("/selectsStandardMethodByFLSSM")
+ @GetMapping("/selectsStandardMethodByFLSSM")
public Result selectsStandardMethodByFLSSM(String tree) {
return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
}
@ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勫唴瀹�")
@PostMapping("/upStandardProductList")
- public Result upStandardProductList(String str) {
+ public Result upStandardProductList(@RequestBody Map<String, String> map) {
+ String str = map.get("str");
StandardProductList list = JSON.parseObject(str, StandardProductList.class);
return Result.success(standardProductListService.upStandardProductList(list));
}
- @ApiOperation(value = "淇敼鏍囧噯搴撳尯闂�")
- @PostMapping("/updateSection")
- public Result updateSection(String str) {
- StandardProductList list = JSON.parseObject(str, StandardProductList.class);
- return Result.success(standardProductListService.updateSection(list));
- }
-
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�")
- @PostMapping("/delStandardMethodByFLSSM")
+ @DeleteMapping("/delStandardMethodByFLSSM")
public Result delStandardMethodByFLSSM(Integer id) {
return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
}
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
- @PostMapping("/delStandardProductByIds")
+ @DeleteMapping("/delStandardProductByIds")
public Result delStandardProductByIds(String ids) {
JSONArray lists = JSON.parseArray(ids);
return Result.success(standardProductListService.delStandardProduct(lists));
@@ -98,36 +86,41 @@
@ApiOperation(value = "鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
@PostMapping("/addStandardProduct")
- public Result addStandardProduct(String ids, String tree) {
+ public Result addStandardProduct(@RequestBody Map<String,Object> map) {
+ String ids =(String) map.get("ids");
+ String tree =(String) map.get("tree");
return Result.success(standardTreeService.addStandardProduct(ids, tree));
}
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
- @PostMapping("/delStandardTree")
+ @DeleteMapping("/delStandardTree")
public Result delStandardTree(String tree) {
return Result.success(standardTreeService.delStandardTree(tree));
}
@ApiOperation(value = "閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�")
- @PostMapping("/selectStandardProductList")
- public Result selectStandardProductList(@RequestBody InsSampleReceiveDto insSample) {
+ @GetMapping("/selectStandardProductList")
+ public Result selectStandardProductList( InsSample1 insSample) {
return Result.success(standardProductListService.selectStandardProductList(insSample));
}
@ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
@PostMapping("/selectStandardProductListByMethodId")
- public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
+ public Result selectStandardProductListByMethodId(@RequestBody Map<String,Object> map ) {
+ Integer id =(Integer) map.get("id");
+ String tree = (String)map.get("tree");
+ Integer page = (Integer)map.get("page");
return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
}
@ApiOperation(value = "鎵归噺缂栬緫鏌ヨ妫�楠岄」鐩�")
- @PostMapping("/selectStandardProductByMethodId")
+ @GetMapping("/selectStandardProductByMethodId")
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")
+ @GetMapping("/selectStandardProductEnumByMethodId")
public Result selectStandardProductEnumByMethodId(Integer id, String tree, String item) {
return Result.success(standardProductListService.selectStandardProductEnumByMethodId(id, tree, item));
}
@@ -154,7 +147,7 @@
return Result.success(standardTreeService.upStandardProducts(product));
}
- @PostMapping("/getStandTreeBySampleType")
+ @GetMapping("/getStandTreeBySampleType")
@ApiOperation("浠呰幏鍙栧厜绾ょ殑鍨嬪彿")
public Result<?> getStandTreeBySampleType(String laboratory, String sampleType) {
return Result.success(standardTreeService.getStandTreeBySampleType(laboratory, sampleType));
@@ -173,104 +166,28 @@
@ApiOperation("閲嶇疆鏍囧噯搴撳崟浠�")
@PostMapping("/resetTreeOfPrice")
- public Result resetTreeOfPrice(String tree, Integer standardId) {
+ public Result resetTreeOfPrice(@RequestBody Map<String,Object> map) {
+ Integer standardId =(Integer) map.get("standardId");
+ String tree =(String) map.get("tree");
standardTreeService.resetTreeOfPrice(tree, standardId);
return Result.success();
}
@ApiOperation("閲嶇疆鏍囧噯搴撳伐鏃剁郴鏁�")
@PostMapping("/resetTreeOfHour")
- public Result resetTreeOfHour(String tree, Integer standardId) {
+ public Result resetTreeOfHour(@RequestBody Map<String,Object> map) {
+ Integer standardId =(Integer) map.get("standardId");
+ String tree =(String) map.get("tree");
standardTreeService.resetTreeOfHour(tree, standardId);
return Result.success();
}
@ApiOperation("閲嶇疆鏍囧噯搴撹姹傛弿杩板拰瑕佹眰鍊�")
@PostMapping("/resetTreeOfAsk")
- public Result resetTreeOfAsk(String tree, Integer standardId) {
+ public Result resetTreeOfAsk(@RequestBody Map<String,Object> map) {
+ Integer standardId =(Integer) map.get("standardId");
+ String tree =(String) map.get("tree");
standardTreeService.resetTreeOfAsk(tree, standardId);
return Result.success();
- }
-
- @ApiOperation("鏍囧噯搴撴嫋鎷�")
- @PostMapping("/resetTreeDrag")
- public Result resetTreeDrag(@RequestBody ResetTreeDragDTO resetTreeDragDTO) {
- standardProductListService.resetTreeDrag(resetTreeDragDTO);
- return Result.success();
- }
-
- @ApiOperation("鏍囧噯搴撴嫋鎷藉叏閮�")
- @PostMapping("/resetTreeDragBatch")
- public Result resetTreeDragBatch(@RequestBody Map<String, Object> params) {
- List<StandardProductList> standardProductLists = (List<StandardProductList>) params.get("params");
- standardProductListService.resetTreeDragBatch(standardProductLists);
- return Result.success();
- }
-
- @ApiOperation(value = "鏍囧噯鏍戞帓搴�")
- @PostMapping("/updateTreeSort")
- public Result updateTreeSort(@RequestBody List<FactoryDto> list) {
- return Result.success(standardTreeService.updateTreeSort(list));
- }
-
- /*************************************************** 鍘傚鐗规畩瑕佹眰鍊煎鐞� ************************************************************/
-
- @ApiOperation(value = "鏍规嵁浜у搧id鏌ヨ鍘傚瑕佹眰鍊肩粦瀹�")
- @PostMapping("/selectSupplierAsk")
- public Result selectSupplierAsk(StandardProductListSupplierAsk supplierAsk) throws Exception {
- return Result.success(standardProductListSupplierAskService.selectByProductId(supplierAsk));
- }
-
- @ApiOperation(value = "鏂板鍘傚瑕佹眰鍊肩粦瀹�")
- @PostMapping("/addProductSupplierAsk")
- public Result addProductSupplierAsk(String str) {
- StandardProductListSupplierAsk supplierAsk = JSON.parseObject(str, StandardProductListSupplierAsk.class);
- return Result.success(standardProductListSupplierAskService.addProductSupplierAsk(supplierAsk));
- }
-
- @ApiOperation(value = "鏇存柊鍘傚瑕佹眰鍊肩粦瀹�")
- @PostMapping("/updateProductSupplierAsk")
- public Result updateProductSupplierAsk(String str) {
- StandardProductListSupplierAsk supplierAsk = JSON.parseObject(str, StandardProductListSupplierAsk.class);
- standardProductListSupplierAskService.updateProductSupplierAsk(supplierAsk);
- return Result.success();
- }
-
- @ApiOperation(value = "鍒犻櫎鍘傚瑕佹眰鍊肩粦瀹�")
- @PostMapping("/deleteProductSupplierAsk")
- public Result deleteProductSupplierAsk(Integer supplierAskId) {
- standardProductListSupplierAskService.removeById(supplierAskId);
- return Result.success();
- }
-
- @ApiOperation(value = "淇敼鏍囧噯鏍�")
- @PostMapping("/updateStandardTree")
- public Result updateStandardTree(@RequestBody StandardTree standardTree) {
- return Result.success(standardTreeService.updateStandardTree(standardTree));
- }
-
- @ApiOperation(value = "妫�楠岄」瑕佹眰鍊煎鍒跺姣�")
- @PostMapping("/copyStandardProductList")
- public Result copyStandardProductList(@RequestBody CopyStandardProductListDto copyStandardProductListDto) {
- return Result.success(standardProductListService.copyStandardProductList(copyStandardProductListDto));
- }
-
- @ApiOperation(value = "妫�楠岄」瑕佹眰鍊煎崟鐙姣�")
- @PostMapping("/copyStandardProductOne")
- public Result copyStandardProductOne(@RequestBody CopyStandardProductListDto copyStandardProductListDto) {
- return Result.success(standardProductListService.copyStandardProductOne(copyStandardProductListDto));
- }
-
- @ApiOperation(value = "妫�楠岄」鎵归噺淇敼瑕佹眰鍊艰姹傛弿杩�")
- @PostMapping("/updateStandardProductListBatch")
- public Result updateStandardProductListBatch(@RequestBody Map<String, Object> param) {
- List<StandardProductList> standardProductList = (List<StandardProductList>) param.get("standardProductList");
- return Result.success(standardProductListService.updateBatchById(standardProductList));
- }
-
- @ApiOperation(value = "妫�楠岄」澶嶅埗鎺掑簭")
- @PostMapping("/copyStandardProductSort")
- public Result copyStandardProductSort(@RequestBody CopyStandardProductListDto copyStandardProductListDto) {
- return Result.success(standardProductListService.copyStandardProductSort(copyStandardProductListDto));
}
}
--
Gitblit v1.9.3