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 | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 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..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
@@ -1,9 +1,15 @@
package com.yuanchu.limslaboratory.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.yuanchu.limslaboratory.pojo.Material;
+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.web.bind.annotation.*;
/**
* <p>
@@ -13,8 +19,34 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
+@Api(tags = "鏍囧噯搴�-->1銆佺墿鏂�")
@RestController
@RequestMapping("/material")
public class MaterialController {
+ @Autowired
+ private MaterialService materialService;
+
+ @ApiOperation("娣诲姞鐗╂枡")
+ @PostMapping("/add")
+ public Result<?> addMaterialInformation(@RequestBody Material material) {
+ Integer isMaterialSuccess = null;
+ if (isMaterialSuccess == 1) {
+ return Result.success("娣诲姞鐗╂枡銆�"+ material.getName() +"銆戞垚鍔燂紒");
+ }
+ return Result.fail("娣诲姞鐗╂枡銆�"+ material.getName() +"銆戝け璐ワ紒");
+ }
+
+ @ApiOperation("鏍规嵁鐗╂枡ID鍒犻櫎鐗╂枡")
+ @DeleteMapping("/delete")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = String.class)
+ })
+ public Result<?> deleteMaterialInformation(String materialId) {
+ Integer isDeleteMaterialSuccess = materialService.deleteMaterialInformation(materialId);
+ if (isDeleteMaterialSuccess == 1) {
+ return Result.success("鍒犻櫎鎴愬姛锛�");
+ }
+ return Result.fail("鍒犻櫎澶辫触锛�");
+ }
}
--
Gitblit v1.9.3