From dd571bf55de7f9a72d458adc179958ed2f9473c0 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 09:39:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 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 73bde91..fc0c456 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,9 +1,18 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.pojo.dto.AddMaterialDto;
+import com.yuanchu.limslaboratory.service.MaterialService;
+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 org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -13,8 +22,50 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
+@Api(tags = "鏍囧噯搴�-->1銆佺墿鏂�")
@RestController
@RequestMapping("/material")
public class MaterialController {
+ @Autowired
+ private MaterialService materialService;
+
+ @ApiOperation(value = "娣诲姞鎸囨爣-->閫夋嫨鏍峰搧鍚嶇О")
+ @GetMapping("/selectmater")
+ public Result selectmater() {
+ return Result.success(materialService.selectmater());
+ }
+
+ @ApiOperation("娣诲姞鎸囨爣")
+ @PostMapping("/add")
+ public Result<?> addMaterialInformation(@Validated @RequestBody AddMaterialDto addMaterialDto) {
+ Integer isMaterialSuccess = materialService.addMaterialInformation(addMaterialDto);
+ if (isMaterialSuccess == 1) {
+ return Result.success("娣诲姞鐗╂枡銆�"+ addMaterialDto.getMaterialName() +"銆戞垚鍔燂紒");
+ }
+ return Result.fail("娣诲姞鐗╂枡銆�"+ addMaterialDto.getMaterialName() +"銆戝け璐ワ紒");
+ }
+
+ @ApiOperation("鏍规嵁鐗╂枡ID鍒犻櫎鐗╂枡")
+ @DeleteMapping("/delete")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = Integer.class)
+ })
+ public Result<?> deleteMaterialInformation(Integer materialId) {
+ Integer isDeleteMaterialSuccess = materialService.deleteMaterialInformation(materialId);
+ if (isDeleteMaterialSuccess == 1) {
+ return Result.success("鍒犻櫎鎴愬姛锛�");
+ }
+ return Result.fail("鍒犻櫎澶辫触锛�");
+ }
+
+ @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