From a303cd042ed27bdf2b8daaf3d3bc23f1ef9956af Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 15 八月 2023 17:59:23 +0800
Subject: [PATCH] 设备台账
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..ad3e993 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
@@ -8,6 +8,7 @@
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 +29,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
-@Api(tags = "瀹為獙瀹�-->璁惧鍙拌处-->2銆佷华鍣ㄦā鍧�")
+@Api(tags = "瀹為獙瀹�-->1銆佽澶囧彴璐�-->2銆佷华鍣ㄦā鍧�")
@RestController
@RequestMapping("/instrument")
public class InstrumentController {
@@ -41,7 +42,10 @@
@ApiOperation("娣诲姞浠櫒璁惧")
@PostMapping("/add")
- public Result<?> addInstrumentInformation(@RequestBody Instrument instrument) {
+ 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() + "銆戞垚鍔�!");
--
Gitblit v1.9.3