From e501aa5b8a05b9933f2f805d4b1f8ec36b6014b5 Mon Sep 17 00:00:00 2001 From: guo Date: Sat, 16 Mar 2024 11:21:14 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...anicalEquipmentPositionDevServiceImpl.java | 16 +++++++++ .../service/impl/SafetyHatDevServiceImpl.java | 35 +++++++++++++------ 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDevServiceImpl.java index 906416e55..d894a9aef 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDevServiceImpl.java @@ -1,9 +1,12 @@ package com.zhgd.xmgl.modules.mechanicalequipmentposition.service.impl; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionDev; import com.zhgd.xmgl.modules.mechanicalequipmentposition.mapper.MechanicalEquipmentPositionDevMapper; import com.zhgd.xmgl.modules.mechanicalequipmentposition.service.IMechanicalEquipmentPositionDevService; +import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -59,12 +62,25 @@ public class MechanicalEquipmentPositionDevServiceImpl extends ServiceImpl safetyHatDevList = mechanicalEquipmentPositionDevMapper.selectList(new LambdaQueryWrapper() + .eq(MechanicalEquipmentPositionDev::getDevSn, mechanicalEquipmentPositionDev.getDevSn()) + ); + if (CollUtil.isNotEmpty(safetyHatDevList)) { + throw new OpenAlertException("设备sn已存在"); + } mechanicalEquipmentPositionDev.setId(null); baseMapper.insert(mechanicalEquipmentPositionDev); } @Override public void edit(MechanicalEquipmentPositionDev mechanicalEquipmentPositionDev) { + List safetyHatDevList = mechanicalEquipmentPositionDevMapper.selectList(new LambdaQueryWrapper() + .eq(MechanicalEquipmentPositionDev::getDevSn, mechanicalEquipmentPositionDev.getDevSn()) + .ne(MechanicalEquipmentPositionDev::getId, mechanicalEquipmentPositionDev.getId()) + ); + if (CollUtil.isNotEmpty(safetyHatDevList)) { + throw new OpenAlertException("设备sn已存在"); + } baseMapper.updateById(mechanicalEquipmentPositionDev); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java index 82ef387b0..d8641a439 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java @@ -1,24 +1,25 @@ package com.zhgd.xmgl.modules.safetyhat.service.impl; -import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev; -import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDevMapper; -import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatDevService; -import org.springframework.stereotype.Service; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev; +import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDevMapper; +import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatDevService; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; -import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - /** * @Description: 智能安全帽-设备 * @author： pds @@ -59,12 +60,24 @@ public class SafetyHatDevServiceImpl extends ServiceImpl safetyHatDevList = safetyHatDevMapper.selectList(new LambdaQueryWrapper() + .eq(SafetyHatDev::getDevSn, safetyHatDev.getDevSn())); + if (CollUtil.isNotEmpty(safetyHatDevList)) { + throw new OpenAlertException("设备sn已存在"); + } safetyHatDev.setId(null); baseMapper.insert(safetyHatDev); } @Override public void edit(SafetyHatDev safetyHatDev) { + List safetyHatDevList = safetyHatDevMapper.selectList(new LambdaQueryWrapper() + .eq(SafetyHatDev::getDevSn, safetyHatDev.getDevSn()) + .ne(SafetyHatDev::getId, safetyHatDev.getId()) + ); + if (CollUtil.isNotEmpty(safetyHatDevList)) { + throw new OpenAlertException("设备sn已存在"); + } baseMapper.updateById(safetyHatDev); }