bug修复
This commit is contained in:
parent
3d6b80dab8
commit
e501aa5b8a
@ -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<Mecha
|
||||
|
||||
@Override
|
||||
public void add(MechanicalEquipmentPositionDev mechanicalEquipmentPositionDev) {
|
||||
List<MechanicalEquipmentPositionDev> safetyHatDevList = mechanicalEquipmentPositionDevMapper.selectList(new LambdaQueryWrapper<MechanicalEquipmentPositionDev>()
|
||||
.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<MechanicalEquipmentPositionDev> safetyHatDevList = mechanicalEquipmentPositionDevMapper.selectList(new LambdaQueryWrapper<MechanicalEquipmentPositionDev>()
|
||||
.eq(MechanicalEquipmentPositionDev::getDevSn, mechanicalEquipmentPositionDev.getDevSn())
|
||||
.ne(MechanicalEquipmentPositionDev::getId, mechanicalEquipmentPositionDev.getId())
|
||||
);
|
||||
if (CollUtil.isNotEmpty(safetyHatDevList)) {
|
||||
throw new OpenAlertException("设备sn已存在");
|
||||
}
|
||||
baseMapper.updateById(mechanicalEquipmentPositionDev);
|
||||
}
|
||||
|
||||
|
||||
@ -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<SafetyHatDevMapper, Saf
|
||||
|
||||
@Override
|
||||
public void add(SafetyHatDev safetyHatDev) {
|
||||
List<SafetyHatDev> safetyHatDevList = safetyHatDevMapper.selectList(new LambdaQueryWrapper<SafetyHatDev>()
|
||||
.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<SafetyHatDev> safetyHatDevList = safetyHatDevMapper.selectList(new LambdaQueryWrapper<SafetyHatDev>()
|
||||
.eq(SafetyHatDev::getDevSn, safetyHatDev.getDevSn())
|
||||
.ne(SafetyHatDev::getId, safetyHatDev.getId())
|
||||
);
|
||||
if (CollUtil.isNotEmpty(safetyHatDevList)) {
|
||||
throw new OpenAlertException("设备sn已存在");
|
||||
}
|
||||
baseMapper.updateById(safetyHatDev);
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user