修改bug

Fixiaobai

2023-09-06 8abe275e36823f1065300af45e1f7a9a68f549a7

 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;
@@ -18,10 +21,7 @@
import org.springframework.web.bind.annotation.*;

import javax.validation.constraints.NotNull;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;

/**
 * <p>
@@ -41,15 +41,19 @@

    @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("根据仪器Id查询对应设备码点数据")
@@ -57,8 +61,12 @@
            @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);
        list.forEach(l->{
            l.put("instrumentId",null);
        });
        return Result.success(list);
    }

@@ -67,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){
@@ -77,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);