admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-03-16 11:21:14 +08:00
parent 3d6b80dab8
commit e501aa5b8a
2 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDevServiceImpl.java
View File

@ -1,9 +1,12 @@
package com.zhgd.xmgl.modules.mechanicalequipmentposition.service.impl; 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.jeecg.common.execption.OpenAlertException;
import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionDev; import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionDev;
import com.zhgd.xmgl.modules.mechanicalequipmentposition.mapper.MechanicalEquipmentPositionDevMapper; import com.zhgd.xmgl.modules.mechanicalequipmentposition.mapper.MechanicalEquipmentPositionDevMapper;
import com.zhgd.xmgl.modules.mechanicalequipmentposition.service.IMechanicalEquipmentPositionDevService; import com.zhgd.xmgl.modules.mechanicalequipmentposition.service.IMechanicalEquipmentPositionDevService;
import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -59,12 +62,25 @@ public class MechanicalEquipmentPositionDevServiceImpl extends ServiceImpl<Mecha
@Override @Override
public void add(MechanicalEquipmentPositionDev mechanicalEquipmentPositionDev) { 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); mechanicalEquipmentPositionDev.setId(null);
baseMapper.insert(mechanicalEquipmentPositionDev); baseMapper.insert(mechanicalEquipmentPositionDev);
} }
@Override @Override
public void edit(MechanicalEquipmentPositionDev mechanicalEquipmentPositionDev) { 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); baseMapper.updateById(mechanicalEquipmentPositionDev);
} }

35
src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java
View File

@ -1,24 +1,25 @@
package com.zhgd.xmgl.modules.safetyhat.service.impl; package com.zhgd.xmgl.modules.safetyhat.service.impl;
import com.zhgd.jeecg.common.execption.OpenAlertException; import cn.hutool.core.collection.CollUtil;
import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDevMapper;
import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatDevService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.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.HashMap;
import java.util.List; import java.util.List;
import com.zhgd.xmgl.util.RefUtil;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
/** /**
* @Description: 智能安全帽-设备 * @Description: 智能安全帽-设备
* @author： pds * @author： pds
@ -59,12 +60,24 @@ public class SafetyHatDevServiceImpl extends ServiceImpl<SafetyHatDevMapper, Saf
@Override @Override
public void add(SafetyHatDev safetyHatDev) { 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); safetyHatDev.setId(null);
baseMapper.insert(safetyHatDev); baseMapper.insert(safetyHatDev);
} }
@Override @Override
public void edit(SafetyHatDev safetyHatDev) { 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); baseMapper.updateById(safetyHatDev);
} }