From cdaff9ab0d1b676e3b429171d6de0887c98f488c Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:15:31 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-26标准库修改前
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 41 ++---------------------------------------
1 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
index 5469759..d3ca6fd 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
@@ -2,10 +2,7 @@
import com.yuanchu.limslaboratory.pojo.Material;
-import com.yuanchu.limslaboratory.pojo.dto.UpdateMaterialInformation;
import com.yuanchu.limslaboratory.service.MaterialService;
-import com.yuanchu.limslaboratory.utils.JackSonUtil;
-import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -13,9 +10,6 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -25,7 +19,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "鏍囧噯搴�-->4銆佽鏍�-->鏌ョ湅-->鐖舵ā鍧�")
+@Api(tags = "鏍囧噯搴�-->1銆佺墿鏂�")
@RestController
@RequestMapping("/material")
public class MaterialController {
@@ -36,31 +30,11 @@
@ApiOperation("娣诲姞鐗╂枡")
@PostMapping("/add")
public Result<?> addMaterialInformation(@RequestBody Material material) {
- Integer isMaterialSuccess = materialService.addMaterialInformation(material);
+ Integer isMaterialSuccess = null;
if (isMaterialSuccess == 1) {
return Result.success("娣诲姞鐗╂枡銆�"+ material.getName() +"銆戞垚鍔燂紒");
}
return Result.fail("娣诲姞鐗╂枡銆�"+ material.getName() +"銆戝け璐ワ紒");
- }
-
- @ApiOperation("鏍规嵁瑙勬牸ID鏌ヨ鎵�鏈夌墿鏂�")
- @GetMapping("/list")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(value = "瑙勬牸ID", name = "specificationsId", dataTypeClass = String.class)
- })
- public Result<?> getListMaterialInformation(String specificationsId) {
- List<Map<String, Object>> listMaterialInformation = materialService.getListMaterialInformation(specificationsId);
- return Result.success(listMaterialInformation);
- }
-
- @ApiOperation("鏍规嵁鐗╂枡ID鏌ヨ鐗╂枡璇︽儏")
- @GetMapping("/list_id")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = String.class)
- })
- public Result<?> getListIdMaterialInformation(String materialId) throws Exception {
- Material listIdMaterialInformation = materialService.ListIdMaterialInformation(materialId);
- return Result.success(listIdMaterialInformation);
}
@ApiOperation("鏍规嵁鐗╂枡ID鍒犻櫎鐗╂枡")
@@ -74,16 +48,5 @@
return Result.success("鍒犻櫎鎴愬姛锛�");
}
return Result.fail("鍒犻櫎澶辫触锛�");
- }
-
- @ApiOperation("淇敼鐗╂枡")
- @PutMapping("/update")
- public Result<?> updateMaterialInformation(@RequestBody UpdateMaterialInformation updateMaterialInformation) throws Exception {
- Material material = JackSonUtil.unmarshal(JackSonUtil.marshal(updateMaterialInformation), Material.class);
- Integer isUpdateMaterialSuccess = materialService.updateMaterialInformation(material);
- if (isUpdateMaterialSuccess == 1) {
- return Result.success("淇敼鐗╂枡銆�"+ material.getName() +"銆戞垚鍔燂紒");
- }
- return Result.fail("淇敼鐗╂枡銆�"+ material.getName() +"銆戝け璐ワ紒");
}
}
--
Gitblit v1.9.3