From 19c9e29273e8e751847d9dcb06b346dede48d2c8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 15:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
index dc56db5..aa08081 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.enums.InterfaceType;
+import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.yuanchu.limslaboratory.service.RawMaterialService;
import com.yuanchu.limslaboratory.vo.Result;
@@ -12,9 +14,9 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@@ -53,4 +55,26 @@
map.put("total", iPage.getTotal());
return Result.success(map);
}
+
+ @ApiOperation("鍘熸潗鏂欐姤妫�娣诲姞")
+ @PostMapping("/add")
+ @AuthHandler(type = InterfaceType.ADD,menuId = MenuEnums.reportForInspection,isAdd = true)
+ public Result<?> insertRawMaterial(@Validated @RequestBody RawMaterial rawMaterial) {
+ Integer integer = rawMaterialService.insertRawMaterial(rawMaterial);
+ if (integer >= 1) {
+ return Result.success("娣诲姞鎴愬姛");
+ }
+ return Result.fail("娣诲姞澶辫触");
+ }
+
+ @ApiOperation("鍘熸潗鏂欐姤妫�鍒犻櫎")
+ @PostMapping("/delete")
+ @AuthHandler(type = InterfaceType.DELETE,menuId = MenuEnums.reportForInspection,isAdd = true)
+ public Result<?> deleteRawMaterial(String deleteId) {
+ Integer integer = rawMaterialService.deleteRawMaterial(deleteId);
+ if (integer >= 1) {
+ return Result.success("鍒犻櫎鎴愬姛");
+ }
+ return Result.fail("鍒犻櫎澶辫触");
+ }
}
--
Gitblit v1.9.3