From d0a6fc23f31f924cb1744397478dc4c7c57c04e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardController.java
index 37ab29e..665f006 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardController.java
@@ -1,11 +1,12 @@
package com.yuanchu.limslaboratory.controller;
-
+import com.yuanchu.limslaboratory.pojo.dto.AddStandardDto;
import com.yuanchu.limslaboratory.service.StandardService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
@@ -24,11 +25,21 @@
@Autowired
private StandardService standardService;
+ @ApiOperation("娣诲姞鐗╂枡")
+ @PostMapping("/add")
+ public Result<?> addStandardInformation(@Validated @RequestBody AddStandardDto addStandardDto) {
+ Integer isMaterialSuccess = standardService.addStandardInformation(addStandardDto);
+ if (isMaterialSuccess == 1) {
+ return Result.success("娣诲姞鐗╂枡銆�"+ addStandardDto.getStandardName() +"銆戞垚鍔燂紒");
+ }
+ return Result.fail("娣诲姞鐗╂枡銆�"+ addStandardDto.getStandardName() +"銆戝け璐ワ紒");
+ }
+
@ApiOperation("鏍规嵁ID鍒犻櫎鏁版嵁")
@DeleteMapping("/delete")
- public Result<?> deleteStandardsInformation(String standardsId) {
- Integer isDeleteSuccess = standardService.deleteStandardsInformation(standardsId);
- if (isDeleteSuccess == 1){
+ public Result<?> deleteStandardsInformation(Integer standardsId) {
+ Integer isDeleteMaterialSuccess = standardService.deleteStandardInformation(standardsId);
+ if (isDeleteMaterialSuccess == 1) {
return Result.success("鍒犻櫎鎴愬姛锛�");
}
return Result.fail("鍒犻櫎澶辫触锛�");
--
Gitblit v1.9.3