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 | 80 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 2 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 ae1075c..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
@@ -1,9 +1,28 @@
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.EquipmentPoint;
+import com.yuanchu.limslaboratory.pojo.dto.UpdateEquipmentPointDto;
+import com.yuanchu.limslaboratory.service.EquipmentPointService;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
+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 javax.validation.constraints.NotNull;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
/**
* <p>
@@ -13,8 +32,65 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
+@Api(tags = "瀹為獙瀹�-->1銆佽澶囧彴璐�-->3銆佽澶囩爜鐐�")
@RestController
@RequestMapping("/equipment-point")
public class EquipmentPointController {
+ @Autowired
+ private EquipmentPointService equipmentPointService;
+
+ @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);
+ equipmentPoint.setUserId((Integer) unmarshal.get("id"));
+ Integer isInsertSuccess = equipmentPointService.addEquipmentPointInformation(equipmentPoint);
+ if (isInsertSuccess == 1){
+ return Result.success("娣诲姞銆�"+ equipmentPoint.getEquipmentPointName() +"銆戞垚鍔燂紒");
+ }
+ return Result.fail("娣诲姞銆�"+ equipmentPoint.getEquipmentPointName() +"銆戝け璐ワ紒璁惧鐮佺偣缂栫爜閲嶅锛�");
+ }
+
+ @ApiOperation("鏍规嵁浠櫒Id鏌ヨ瀵瑰簲璁惧鐮佺偣鏁版嵁")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "InstrumentId", value = "浠櫒妯″潡Id", dataTypeClass = String.class, required = true)
+ })
+ @GetMapping("/list")
+ @AuthHandler
+ public Result<?> getListEquipmentPointInformation(String InstrumentId) {
+ List<Map<String, Object>> list = equipmentPointService.getListEquipmentPointInformation(InstrumentId);
+ return Result.success(list);
+ }
+
+ @ApiOperation("鏍规嵁鐮佺偣Id鍒犻櫎鏁版嵁")
+ @ApiImplicitParams(value = {
+ @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){
+ return Result.success("鍒犻櫎鎴愬姛锛�");
+ }
+ return Result.fail("鍒犻櫎澶辫触锛�");
+ }
+
+ @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);
+ EquipmentPoint equipmentPoint = JackSonUtil.unmarshal(JackSonUtil.marshal(updateEquipmentPointDto), EquipmentPoint.class);
+ equipmentPoint.setUserId((Integer) unmarshal.get("id"));
+ Integer isUpdateSuccess = equipmentPointService.updateEquipmentPointInformation(equipmentPoint);
+ if (isUpdateSuccess == 1){
+ return Result.success("鏇存柊鎴愬姛锛�");
+ }
+ return Result.fail("鏇存柊澶辫触锛�");
+ }
}
--
Gitblit v1.9.3