From 1865de1cd0255f7c42a326018a8cc3b5a1ee5253 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 09:03:26 +0800
Subject: [PATCH] 权限
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 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 d3ca6fd..807bfe6 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,7 +1,7 @@
package com.yuanchu.limslaboratory.controller;
-
-import com.yuanchu.limslaboratory.pojo.Material;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.pojo.dto.AddMaterialDto;
import com.yuanchu.limslaboratory.service.MaterialService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -9,7 +9,11 @@
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 java.util.List;
+import java.util.Map;
/**
* <p>
@@ -27,26 +31,43 @@
@Autowired
private MaterialService materialService;
- @ApiOperation("娣诲姞鐗╂枡")
+ @ApiOperation(value = "娣诲姞鎸囨爣-->閫夋嫨鏍峰搧鍚嶇О")
+ @GetMapping("/selectmater")
+ @AuthHandler
+ public Result selectmater() {
+ return Result.success(materialService.selectmater());
+ }
+
+ @ApiOperation("娣诲姞鎸囨爣")
@PostMapping("/add")
- public Result<?> addMaterialInformation(@RequestBody Material material) {
- Integer isMaterialSuccess = null;
+ @AuthHandler
+ public Result<?> addMaterialInformation(@Validated @RequestBody AddMaterialDto addMaterialDto) {
+ Integer isMaterialSuccess = materialService.addMaterialInformation(addMaterialDto);
if (isMaterialSuccess == 1) {
- return Result.success("娣诲姞鐗╂枡銆�"+ material.getName() +"銆戞垚鍔燂紒");
+ return Result.success("娣诲姞鐗╂枡銆�"+ addMaterialDto.getMaterialName() +"銆戞垚鍔燂紒");
}
- return Result.fail("娣诲姞鐗╂枡銆�"+ material.getName() +"銆戝け璐ワ紒");
+ return Result.fail("娣诲姞鐗╂枡銆�"+ addMaterialDto.getMaterialName() +"銆戝け璐ワ紒");
}
@ApiOperation("鏍规嵁鐗╂枡ID鍒犻櫎鐗╂枡")
@DeleteMapping("/delete")
@ApiImplicitParams(value = {
- @ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = String.class)
+ @ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = Integer.class)
})
- public Result<?> deleteMaterialInformation(String materialId) {
+ @AuthHandler
+ public Result<?> deleteMaterialInformation(Integer materialId) {
Integer isDeleteMaterialSuccess = materialService.deleteMaterialInformation(materialId);
if (isDeleteMaterialSuccess == 1) {
return Result.success("鍒犻櫎鎴愬姛锛�");
}
return Result.fail("鍒犻櫎澶辫触锛�");
}
+
+ @ApiOperation(value = "鏍囧噯搴�-->鐗╂枡-->渚ц竟鏍忓洓绾у睍寮�")
+ @GetMapping("/list")
+ @AuthHandler
+ public Result<?> getFourLevelInformation() {
+ List<Map<String, Object>> fourLevelInformation = materialService.getFourLevelInformation();
+ return Result.success(fourLevelInformation);
+ }
}
--
Gitblit v1.9.3