From 653cbd6bc42565dbdcc7fdbe652874738b1908df Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 25 七月 2023 15:32:34 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-25标准库修改前
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 6e39015..5469759 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,6 +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;
@@ -24,7 +25,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "鏍囧噯搴�-->瑙勬牸-->鏌ョ湅-->鐖�->鐗╂枡")
+@Api(tags = "鏍囧噯搴�-->4銆佽鏍�-->鏌ョ湅-->鐖舵ā鍧�")
@RestController
@RequestMapping("/material")
public class MaterialController {
@@ -32,7 +33,7 @@
@Autowired
private MaterialService materialService;
- @ApiOperation("鐗╂枡搴�-->娣诲姞鐗╂枡")
+ @ApiOperation("娣诲姞鐗╂枡")
@PostMapping("/add")
public Result<?> addMaterialInformation(@RequestBody Material material) {
Integer isMaterialSuccess = materialService.addMaterialInformation(material);
@@ -42,7 +43,7 @@
return Result.fail("娣诲姞鐗╂枡銆�"+ material.getName() +"銆戝け璐ワ紒");
}
- @ApiOperation("鐗╂枡搴�-->鏍规嵁瑙勬牸ID鏌ヨ鎵�鏈夌墿鏂�")
+ @ApiOperation("鏍规嵁瑙勬牸ID鏌ヨ鎵�鏈夌墿鏂�")
@GetMapping("/list")
@ApiImplicitParams(value = {
@ApiImplicitParam(value = "瑙勬牸ID", name = "specificationsId", dataTypeClass = String.class)
@@ -52,17 +53,17 @@
return Result.success(listMaterialInformation);
}
- @ApiOperation("鐗╂枡搴�-->鏍规嵁瑙勬牸ID鏌ヨ鐗╂枡璇︽儏")
+ @ApiOperation("鏍规嵁鐗╂枡ID鏌ヨ鐗╂枡璇︽儏")
@GetMapping("/list_id")
@ApiImplicitParams(value = {
@ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = String.class)
})
- public Result<?> getListIdMaterialInformation(String materialId) {
+ public Result<?> getListIdMaterialInformation(String materialId) throws Exception {
Material listIdMaterialInformation = materialService.ListIdMaterialInformation(materialId);
return Result.success(listIdMaterialInformation);
}
- @ApiOperation("鐗╂枡搴�-->鏍规嵁鐗╂枡ID鍒犻櫎鐗╂枡")
+ @ApiOperation("鏍规嵁鐗╂枡ID鍒犻櫎鐗╂枡")
@DeleteMapping("/delete")
@ApiImplicitParams(value = {
@ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = String.class)
@@ -75,9 +76,10 @@
return Result.fail("鍒犻櫎澶辫触锛�");
}
- @ApiOperation("鐗╂枡搴�-->淇敼鐗╂枡")
+ @ApiOperation("淇敼鐗╂枡")
@PutMapping("/update")
- public Result<?> updateMaterialInformation(@RequestBody Material material) {
+ 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() +"銆戞垚鍔燂紒");
--
Gitblit v1.9.3