From 3ad5b828240db97470c9a08b247b1f6f5cdc0dd7 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 04 八月 2023 11:30:33 +0800
Subject: [PATCH] LIMS管理系统框架-开发8-4
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 60 +++++++++++++++++++-----------------------------------------
1 files changed, 19 insertions(+), 41 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..8a89867 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
@@ -1,16 +1,14 @@
package com.yuanchu.limslaboratory.controller;
-
-import com.yuanchu.limslaboratory.pojo.Material;
+import com.yuanchu.limslaboratory.pojo.dto.AddMaterialDto;
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;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -24,7 +22,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "鏍囧噯搴�-->瑙勬牸-->鏌ョ湅-->鐖�->鐗╂枡")
+@Api(tags = "鏍囧噯搴�-->1銆佺墿鏂�")
@RestController
@RequestMapping("/material")
public class MaterialController {
@@ -32,42 +30,22 @@
@Autowired
private MaterialService materialService;
- @ApiOperation("鐗╂枡搴�-->娣诲姞鐗╂枡")
+ @ApiOperation("娣诲姞鐗╂枡")
@PostMapping("/add")
- public Result<?> addMaterialInformation(@RequestBody Material material) {
- Integer isMaterialSuccess = materialService.addMaterialInformation(material);
+ public Result<?> addMaterialInformation(@Validated @RequestBody AddMaterialDto addMaterialDto) {
+ Integer isMaterialSuccess = materialService.addMaterialInformation(addMaterialDto);
if (isMaterialSuccess == 1) {
- return Result.success("娣诲姞鐗╂枡銆�"+ material.getName() +"銆戞垚鍔燂紒");
+ return Result.success("娣诲姞鐗╂枡銆�"+ addMaterialDto.getMaterialName() +"銆戞垚鍔燂紒");
}
- return Result.fail("娣诲姞鐗╂枡銆�"+ material.getName() +"銆戝け璐ワ紒");
+ return Result.fail("娣诲姞鐗╂枡銆�"+ addMaterialDto.getMaterialName() +"銆戝け璐ワ紒");
}
- @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) {
- 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)
+ @ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = Integer.class)
})
- public Result<?> deleteMaterialInformation(String materialId) {
+ public Result<?> deleteMaterialInformation(Integer materialId) {
Integer isDeleteMaterialSuccess = materialService.deleteMaterialInformation(materialId);
if (isDeleteMaterialSuccess == 1) {
return Result.success("鍒犻櫎鎴愬姛锛�");
@@ -75,13 +53,13 @@
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() +"銆戝け璐ワ紒");
+ @ApiOperation(value = "鏍囧噯搴�-->鐗╂枡-->渚ц竟鏍忓洓绾у睍寮�", tags = "猸愨瓙猸愬悗绔皟鏁�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(value = "鍨嬪彿/鍨嬪彿鍚嶇О", name = "specificationName", dataTypeClass = String.class)
+ })
+ @GetMapping("/list")
+ public Result<?> getFourLevelInformation(String specificationName) {
+ List<Map<String, Object>> fourLevelInformation = materialService.getFourLevelInformation(specificationName);
+ return Result.success(fourLevelInformation);
}
}
--
Gitblit v1.9.3