From 9049b77f12ec8e41f533be100132ea71163af35e Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 31 八月 2023 16:44:29 +0800
Subject: [PATCH] 修改委托信息
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 108 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 3b1ee87..aab318e 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
@@ -1,9 +1,26 @@
package com.yuanchu.limslaboratory.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+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;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
/**
* <p>
@@ -13,8 +30,97 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
+@Api(tags = "瀹為獙瀹�-->1銆佽澶囧彴璐�-->2銆佷华鍣ㄦā鍧�")
@RestController
@RequestMapping("/instrument")
public class InstrumentController {
+ @Autowired
+ private InstrumentService instrumentService;
+
+ @Autowired
+ private UserService userService;
+
+ @ApiOperation("娣诲姞浠櫒璁惧")
+ @PostMapping("/add")
+ @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() + "銆戞垚鍔�!");
+ }
+ return Result.fail("浠櫒璁惧缂栧彿閲嶅锛屾坊鍔犮��" + instrument.getEquipmentName() + "銆戝け璐�! ");
+ }
+
+ @ApiOperation("鏍规嵁鍒嗙被Id锛氬垎椤靛垪琛ㄥ睍绀�")
+ @GetMapping("/list")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "classifyId", value = "鍒嗙被Id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "conditions", value = "鏌ヨ鐘舵��:榛樿鍏ㄩ儴", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "whetherWhether", value = "鏄惁宸茶繃鏈�", dataTypeClass = Boolean.class),
+ @ApiImplicitParam(name = "numberOrNameOrSpecifications", value = "缂栧彿/璁惧鍚嶇О/瑙勬牸鍨嬪彿", dataTypeClass = String.class)
+ })
+ @AuthHandler
+ public Result<?> getListInstrumentInformation(Integer pageNo,
+ Integer pageSize,
+ Integer conditions,
+ Integer classifyId,
+ Boolean whetherWhether,
+ String numberOrNameOrSpecifications) {
+ IPage<Map<String, Object>> pageList = instrumentService.getListInstrumentInformation(conditions, whetherWhether, numberOrNameOrSpecifications,
+ classifyId, new Page<Objects>(pageNo, pageSize));
+ Map<String, Object> map = new HashMap<>();
+ map.put("row", pageList.getRecords());
+ map.put("total", pageList.getTotal());
+ return Result.success(map);
+ }
+
+ @ApiOperation("鍒犻櫎浠櫒鏁版嵁")
+ @DeleteMapping("/delete")
+ @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){
+ return Result.success("鍒犻櫎浠櫒鎴愬姛锛�");
+ }
+ return Result.fail("鍒犻櫎浠櫒澶辫触锛�");
+ }
+
+ @ApiOperation("娣诲姞浠櫒鏃朵繚绠′汉涓嬫媺妗嗘暟鎹�")
+ @GetMapping("/get_user")
+ @AuthHandler
+ public Result<?> getMapUserInformation() {
+ return Result.success(userService.getUserNameAndId());
+ }
+
+ @ApiOperation("鏍规嵁浠櫒Id鑾峰彇淇℃伅鐢ㄤ簬缂栬緫")
+ @ApiImplicitParams(value = {
+ @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);
+ }
+
+ @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);
+ if (isUpdateSuccess == 1){
+ return Result.success("鏇存柊銆�" + instrument.getEquipmentName() + "銆戞垚鍔�!");
+ }
+ return Result.fail("浠櫒璁惧缂栧彿閲嶅锛屾洿鏂般��" + instrument.getEquipmentName() + "銆戝け璐�! ");
+ }
}
--
Gitblit v1.9.3