From 8abe275e36823f1065300af45e1f7a9a68f549a7 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 06 九月 2023 16:14:40 +0800
Subject: [PATCH] 修改bug
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 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..3c84090 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,8 +1,11 @@
package com.yuanchu.limslaboratory.controller;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
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,10 +20,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import javax.validation.constraints.NotNull;
+import java.util.*;
/**
* <p>
@@ -30,7 +31,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
-@Api(tags = "瀹為獙瀹�-->璁惧鍙拌处-->3銆佽澶囩爜鐐�")
+@Api(tags = "瀹為獙瀹�-->1銆佽澶囧彴璐�-->3銆佽澶囩爜鐐�")
@RestController
@RequestMapping("/equipment-point")
public class EquipmentPointController {
@@ -40,21 +41,32 @@
@ApiOperation("娣诲姞璁惧鐮佺偣")
@PostMapping("/add")
- public Result<?> addEquipmentPointInformation(@RequestHeader("X-Token") String token, @RequestBody EquipmentPoint equipmentPoint) throws Exception {
+ @AuthHandler
+ public Result<?> addEquipmentPointInformation(@RequestHeader("X-Token") String token, @RequestBody List<EquipmentPoint> equipmentPoints) 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() +"銆戞垚鍔燂紒");
+ equipmentPoints.forEach(e->{
+ e.setUserId((Integer) unmarshal.get("id"));
+ e.setCreateTime(new Date());
+ e.setUpdateTime(new Date());
+ });
+ if(equipmentPointService.addEquipmentPointInformation(equipmentPoints)>0){
+ return Result.success("娣诲姞鎴愬姛");
}
- return Result.fail("娣诲姞銆�"+ equipmentPoint.getEquipmentPointName() +"銆戝け璐ワ紒璁惧鐮佺偣缂栫爜閲嶅锛�");
+ return Result.fail("娣诲姞澶辫触");
}
- @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);
+ list.forEach(l->{
+ l.put("instrumentId",null);
+ });
return Result.success(list);
}
@@ -63,6 +75,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 +86,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