From 9f19d3a24f8474bf6f9eb9401888c44b34b381e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 十一月 2024 14:29:50 +0800
Subject: [PATCH] 第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)
---
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 143 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 125 insertions(+), 18 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 761d92e..92e2acc 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,21 +3,30 @@
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.InsOrderService;
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 org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Map;
@RestController
@AllArgsConstructor
@RequestMapping("/standardTree")
+@Api(tags = "鏍囧噯搴�")
public class StandardTreeController {
private StandardTreeService standardTreeService;
@@ -26,84 +35,182 @@
private StandardProductListService standardProductListService;
- private InsOrderService insOrderService;
-
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "鑾峰彇鏍囧噯鏍�")
@GetMapping("/selectStandardTreeList")
- public Result selectStandardTreeList(){
+ public Result selectStandardTreeList() {
return Result.success(standardTreeService.selectStandardTreeList());
}
+ @ValueAuth
+ @ApiOperation(value = "鑾峰彇鏍囧噯鏍�(妫�楠屼笅鍗�)")
+ @GetMapping("/selectStandardTreeList2")
+ public Result selectStandardTreeList2() {
+ return Result.success(standardTreeService.selectStandardTreeList2());
+ }
+
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "娣诲姞鏍囧噯鏍�")
@PostMapping("/addStandardTree")
- public Result addStandardTree(@RequestBody StandardTree standardTree){
- if(standardTree.getModel().equals("")) standardTree.setModel(null);
+ 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){
+ public Result addStandardMethodList(String tree, Integer standardId) {
return Result.success(standardMethodListService.addStandardMethodList(standardId, tree));
}
@ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�")
@PostMapping("/selectsStandardMethodByFLSSM")
@ValueAuth
- public Result selectsStandardMethodByFLSSM(String tree){
+ public Result selectsStandardMethodByFLSSM(String tree) {
return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
}
- @ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勮姹傚��")
+ @ValueClassify("鏍囧噯搴�")
+ @ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勫唴瀹�")
@PostMapping("/upStandardProductList")
- public Result upStandardProductList(@RequestBody StandardProductList list){
+ public Result upStandardProductList(String str) {
+ StandardProductList list = JSON.parseObject(str, StandardProductList.class);
return Result.success(standardProductListService.upStandardProductList(list));
}
+ @ValueAuth
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�")
@PostMapping("/delStandardMethodByFLSSM")
- public Result delStandardMethodByFLSSM(Integer id){
+ public Result delStandardMethodByFLSSM(Integer id) {
return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
}
+ @ValueAuth
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
@PostMapping("/delStandardProductByIds")
- public Result delStandardProductByIds(String ids){
+ 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){
+ public Result addStandardProduct(String ids, String tree) {
return Result.success(standardTreeService.addStandardProduct(ids, tree));
}
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
@PostMapping("/delStandardTree")
- public Result delStandardTree(String tree){
+ public Result delStandardTree(String tree) {
return Result.success(standardTreeService.delStandardTree(tree));
}
@ApiOperation(value = "閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�")
@PostMapping("/selectStandardProductList")
@ValueAuth
- public Result selectStandardProductList(@RequestBody InsSample insSample){
+ public Result selectStandardProductList(@RequestBody InsSample insSample) {
return Result.success(standardProductListService.selectStandardProductList(insSample));
}
@ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
@PostMapping("/selectStandardProductListByMethodId")
@ValueAuth
- public Result selectStandardProductListByMethodId(Integer id){
- return Result.success(standardProductListService.selectStandardProductListByMethodId(id));
+ 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, String item) {
+ return Result.success(standardProductListService.selectStandardProductEnumByMethodId(id, tree, item));
}
@ApiOperation(value = "鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇")
@GetMapping("/selectStandardMethodEnum")
@ValueAuth
- public Result selectStandardMethodEnum(){
+ 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));
+ }
+
+ @ValueAuth
+ @PostMapping("/getStandTreeBySampleType")
+ @ApiOperation("浠呰幏鍙栧厜绾ょ殑鍨嬪彿")
+ public Result<?> getStandTreeBySampleType(String laboratory, String sampleType) {
+ return Result.success(standardTreeService.getStandTreeBySampleType(laboratory, sampleType));
+ }
+
+ @ValueClassify("鏍囧噯搴�")
+ @ApiOperation("瀵煎叆鏍囧噯搴�")
+ @PostMapping("/inExcelOfTree/{isEquipment}")
+ public Result inExcelOfTree(@RequestParam("file") MultipartFile file, @PathVariable("isEquipment") Boolean isEquipment) {
+ if (!isEquipment) {
+ standardTreeService.inExcelOfTree(file);
+ } else {
+ standardTreeService.importWorkstationExcel(file);
+ }
+ return Result.success();
+ }
+
+ @ValueClassify("鏍囧噯搴�")
+ @ApiOperation("瀵煎嚭鏍囧噯搴�")
+ @GetMapping("/exportStandTree")
+ public void exportStandTree(HttpServletResponse response) throws IOException {
+ standardTreeService.exportStandTree(response);
+ }
+
+ @ValueAuth
+ @ApiOperation("閲嶇疆鏍囧噯搴撳崟浠�")
+ @PostMapping("/resetTreeOfPrice")
+ public Result resetTreeOfPrice(String tree, Integer standardId) {
+ standardTreeService.resetTreeOfPrice(tree, standardId);
+ return Result.success();
+ }
+
+ @ValueAuth
+ @ApiOperation("閲嶇疆鏍囧噯搴撳伐鏃剁郴鏁�")
+ @PostMapping("/resetTreeOfHour")
+ public Result resetTreeOfHour(String tree, Integer standardId) {
+ standardTreeService.resetTreeOfHour(tree, standardId);
+ return Result.success();
+ }
+
+ @ValueAuth
+ @ApiOperation("閲嶇疆鏍囧噯搴撹姹傛弿杩板拰瑕佹眰鍊�")
+ @PostMapping("/resetTreeOfAsk")
+ public Result resetTreeOfAsk(String tree, Integer standardId) {
+ standardTreeService.resetTreeOfAsk(tree, standardId);
+ return Result.success();
+ }
}
--
Gitblit v1.9.3