From c9da1b0da1178911e383ddcaebecd1e088fa6004 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 05 九月 2023 16:37:07 +0800
Subject: [PATCH] 修改bug
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java
index 3c95351..2f0c2a8 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java
@@ -3,11 +3,13 @@
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.Instrument;
import com.yuanchu.limslaboratory.pojo.dto.UpdateInstrumentDto;
import com.yuanchu.limslaboratory.service.InstrumentService;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -28,7 +30,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
-@Api(tags = "瀹為獙瀹�-->璁惧鍙拌处-->2銆佷华鍣ㄦā鍧�")
+@Api(tags = "瀹為獙瀹�-->1銆佽澶囧彴璐�-->2銆佷华鍣ㄦā鍧�")
@RestController
@RequestMapping("/instrument")
public class InstrumentController {
@@ -41,7 +43,11 @@
@ApiOperation("娣诲姞浠櫒璁惧")
@PostMapping("/add")
- public Result<?> addInstrumentInformation(@RequestBody Instrument instrument) {
+ @AuthHandler
+ public Result<?> addInstrumentInformation(@RequestHeader("X-Token") String token, @RequestBody Instrument instrument) throws Exception {
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ instrument.setCreateUserId((Integer) unmarshal.get("id"));
Integer isInsertSuccess = instrumentService.addInstrumentInformation(instrument);
if (isInsertSuccess == 1){
return Result.success("娣诲姞銆�" + instrument.getEquipmentName() + "銆戞垚鍔�!");
@@ -59,6 +65,7 @@
@ApiImplicitParam(name = "whetherWhether", value = "鏄惁宸茶繃鏈�", dataTypeClass = Boolean.class),
@ApiImplicitParam(name = "numberOrNameOrSpecifications", value = "缂栧彿/璁惧鍚嶇О/瑙勬牸鍨嬪彿", dataTypeClass = String.class)
})
+ @AuthHandler
public Result<?> getListInstrumentInformation(Integer pageNo,
Integer pageSize,
Integer conditions,
@@ -78,6 +85,7 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "instrumentId", value = "浠櫒Id", dataTypeClass = String.class, required = true)
})
+ @AuthHandler
public Result<?> deleteInstrumentInformation(String instrumentId) {
Boolean isDeleteSuccess = instrumentService.deleteInstrumentInformation(instrumentId);
if (isDeleteSuccess){
@@ -88,6 +96,7 @@
@ApiOperation("娣诲姞浠櫒鏃朵繚绠′汉涓嬫媺妗嗘暟鎹�")
@GetMapping("/get_user")
+ @AuthHandler
public Result<?> getMapUserInformation() {
return Result.success(userService.getUserNameAndId());
}
@@ -97,13 +106,14 @@
@ApiImplicitParam(name = "InstrumentId", value = "鍒嗙被Id", dataTypeClass = Integer.class, required = true)
})
@GetMapping("/get_instrument")
+ @AuthHandler
public Result<?> getIdInstrumentInformation(Integer InstrumentId) {
- Instrument idInstrumentInformation = instrumentService.getIdInstrumentInformation(InstrumentId);
- return Result.success(idInstrumentInformation);
+ return Result.success(instrumentService.getIdInstrumentInformation(InstrumentId));
}
@ApiOperation("鏍规嵁浠櫒Id鏇存柊鏁版嵁")
@PutMapping("/update")
+ @AuthHandler
public Result<?> updateEquipmentPointInformation(@RequestBody UpdateInstrumentDto updateInstrumentDto) throws Exception {
Instrument instrument = JackSonUtil.unmarshal(JackSonUtil.marshal(updateInstrumentDto), Instrument.class);
Integer isUpdateSuccess = instrumentService.updateEquipmentPointInformation(instrument);
--
Gitblit v1.9.3