From b0b8ca4b383c5c3a2373200ca1872c20ee9ff999 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 14:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java
index 614814b..1593be5 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java
@@ -1,6 +1,7 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.pojo.Classify;
import com.yuanchu.limslaboratory.pojo.dto.UpdateClassifyDto;
import com.yuanchu.limslaboratory.service.ClassifyService;
@@ -33,14 +34,15 @@
@ApiOperation("娣诲姞鍒嗙被")
@PostMapping("/add")
+ @AuthHandler
public Result<?> addClassifyInformation(@RequestBody Classify classify) {
Integer isAddClassifySuccess = classifyService.addClassifyInformation(classify);
if (isAddClassifySuccess == 1) {
- return Result.success("娣诲姞鍒嗙被銆�"+ classify.getSonName() +"銆戞垚鍔燂紒");
+ return Result.success("1-$娣诲姞鍒嗙被銆�"+ classify.getSonName() +"銆戞垚鍔燂紒");
} else if (isAddClassifySuccess == 2) {
- return Result.fail("鎶辨瓑閲嶅娣诲姞鍒嗙被鍚嶇О銆�"+ classify.getSonName() +"銆戯紝娣诲姞澶辫触锛�");
+ return Result.success("2-$鎶辨瓑閲嶅娣诲姞鍒嗙被鍚嶇О銆�"+ classify.getSonName() +"銆戯紝娣诲姞澶辫触锛�");
}
- return Result.fail("娣诲姞鍒嗙被銆�"+ classify.getSonName() +"銆戝け璐ワ紒");
+ return Result.success("0-$娣诲姞鍒嗙被銆�"+ classify.getSonName() +"銆戝け璐ワ紒");
}
@ApiOperation("鍒嗙被渚ц竟鏍忓垪琛細濡傛灉sonName涓虹┖锛屽垯甯︾潃father_name鐨処d杩涜鐐瑰嚮鎿嶄綔")
@@ -48,6 +50,7 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(value = "鍒嗙被鍚嶇О", name = "classifyName", dataTypeClass = String.class)
})
+ @AuthHandler
public Result<?> getListClassifyInformation(String classifyName) {
return Result.success(classifyService.getListClassifyInformation(classifyName));
}
@@ -57,6 +60,7 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(value = "鍒嗙被Id", name = "classifyId", dataTypeClass = String.class)
})
+ @AuthHandler
public Result<?> deleteClassifyInformation(String classifyId) {
Boolean isDeleteSuccess = classifyService.deleteClassifyInformation(classifyId);
if (isDeleteSuccess){
@@ -67,6 +71,7 @@
@ApiOperation("鏇存柊鍒嗙被")
@PutMapping("/update")
+ @AuthHandler
public Result<?> updateClassifyInformation(@RequestBody UpdateClassifyDto updateClassifyDto) throws Exception {
Classify classify = JackSonUtil.unmarshal(JackSonUtil.marshal(updateClassifyDto), Classify.class);
Boolean isUpdateClassifySuccess = classifyService.updateClassifyInformation(classify);
--
Gitblit v1.9.3