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'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java
index 4753c3e..9850674 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java
@@ -3,6 +3,7 @@
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.pojo.EquipmentPoint;
import com.yuanchu.limslaboratory.pojo.dto.UpdateEquipmentPointDto;
import com.yuanchu.limslaboratory.service.EquipmentPointService;
@@ -17,6 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.validation.constraints.NotNull;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,7 +32,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
-@Api(tags = "瀹為獙瀹�-->璁惧鍙拌处-->3銆佽澶囩爜鐐�")
+@Api(tags = "瀹為獙瀹�-->1銆佽澶囧彴璐�-->3銆佽澶囩爜鐐�")
@RestController
@RequestMapping("/equipment-point")
public class EquipmentPointController {
@@ -40,6 +42,7 @@
@ApiOperation("娣诲姞璁惧鐮佺偣")
@PostMapping("/add")
+ @AuthHandler
public Result<?> addEquipmentPointInformation(@RequestHeader("X-Token") String token, @RequestBody EquipmentPoint equipmentPoint) throws Exception {
Object object = RedisUtil.get(token);
Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
@@ -51,10 +54,14 @@
return Result.fail("娣诲姞銆�"+ equipmentPoint.getEquipmentPointName() +"銆戝け璐ワ紒璁惧鐮佺偣缂栫爜閲嶅锛�");
}
- @ApiOperation("鏌ヨ鎵�鏈夎澶囩爜鐐规暟鎹�")
+ @ApiOperation("鏍规嵁浠櫒Id鏌ヨ瀵瑰簲璁惧鐮佺偣鏁版嵁")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "InstrumentId", value = "浠櫒妯″潡Id", dataTypeClass = String.class, required = true)
+ })
@GetMapping("/list")
- public Result<?> getListEquipmentPointInformation() {
- List<Map<String, Object>> list = equipmentPointService.getListEquipmentPointInformation();
+ @AuthHandler
+ public Result<?> getListEquipmentPointInformation(String InstrumentId) {
+ List<Map<String, Object>> list = equipmentPointService.getListEquipmentPointInformation(InstrumentId);
return Result.success(list);
}
@@ -63,6 +70,7 @@
@ApiImplicitParam(name = "equipmentPointId", value = "璁惧鐮佺偣Id", dataTypeClass = Integer.class, required = true)
})
@DeleteMapping("/delete")
+ @AuthHandler
public Result<?> deleteEquipmentPointInformation(Integer equipmentPointId) {
Integer isDeleteSuccess = equipmentPointService.deleteEquipmentPointInformation(equipmentPointId);
if (isDeleteSuccess == 1){
@@ -73,6 +81,7 @@
@ApiOperation("鏍规嵁鐮佺偣Id鏇存柊鏁版嵁")
@PutMapping("/update")
+ @AuthHandler
public Result<?> updateEquipmentPointInformation(@RequestHeader("X-Token") String token, @RequestBody UpdateEquipmentPointDto updateEquipmentPointDto) throws Exception {
Object object = RedisUtil.get(token);
Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
--
Gitblit v1.9.3