From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 35 +++++------------------------------
1 files changed, 5 insertions(+), 30 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 4eb8a23..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
@@ -3,8 +3,6 @@
import com.yuanchu.limslaboratory.pojo.Material;
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;
@@ -12,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>
@@ -24,7 +19,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "鏍囧噯搴�-->瑙勬牸-->鏌ョ湅-->鐖�->鐗╂枡")
+@Api(tags = "鏍囧噯搴�-->1銆佺墿鏂�")
@RestController
@RequestMapping("/material")
public class MaterialController {
@@ -32,46 +27,26 @@
@Autowired
private MaterialService materialService;
- @ApiOperation("鐗╂枡搴�-->娣诲姞鐗╂枡")
+ @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鍒犻櫎鐗╂枡")
+ @ApiOperation("鏍规嵁鐗╂枡ID鍒犻櫎鐗╂枡")
@DeleteMapping("/delete")
@ApiImplicitParams(value = {
@ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = String.class)
})
- public Result<?> deleteMaterialInformation(Integer materialId) {
+ public Result<?> deleteMaterialInformation(String materialId) {
Integer isDeleteMaterialSuccess = materialService.deleteMaterialInformation(materialId);
if (isDeleteMaterialSuccess == 1) {
return Result.success("鍒犻櫎鎴愬姛锛�");
}
return Result.fail("鍒犻櫎澶辫触锛�");
- }
-
- @ApiOperation("鐗╂枡搴�-->淇敼鐗╂枡")
- @PutMapping("/update")
- public Result<?> updateMaterialInformation(@RequestBody Material material) {
- Integer isUpdateMaterialSuccess = materialService.updateMaterialInformation(material);
- if (isUpdateMaterialSuccess == 1) {
- return Result.success("淇敼鐗╂枡銆�"+ material.getName() +"銆戞垚鍔燂紒");
- }
- return Result.fail("淇敼鐗╂枡銆�"+ material.getName() +"銆戝け璐ワ紒");
}
}
--
Gitblit v1.9.3