ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

被检设备-设备名称、设备序列号不能重复

Browse Source
This commit is contained in:
caozehui
2025-01-15 09:40:57 +08:00
parent 7163f387f6
commit d4dba1617d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
View File

@@ -75,7 +75,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
@Override @Override
@Transactional(rollbackFor = {Exception.class}) @Transactional(rollbackFor = {Exception.class})
public boolean addPqDev(PqDevParam pqDevParam) { public boolean addPqDev(PqDevParam pqDevParam) {
// this.checkRepeat(pqDevParam, false); this.checkRepeat(pqDevParam, false);
PqDev pqDev = new PqDev(); PqDev pqDev = new PqDev();
BeanUtil.copyProperties(pqDevParam, pqDev); BeanUtil.copyProperties(pqDevParam, pqDev);
@@ -109,7 +109,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
@Override @Override
@Transactional(rollbackFor = {Exception.class}) @Transactional(rollbackFor = {Exception.class})
public boolean updatePqDev(PqDevParam.UpdateParam updateParam) { public boolean updatePqDev(PqDevParam.UpdateParam updateParam) {
// this.checkRepeat(updateParam, true); this.checkRepeat(updateParam, true);
PqDev pqDev = new PqDev(); PqDev pqDev = new PqDev();
BeanUtil.copyProperties(updateParam, pqDev); BeanUtil.copyProperties(updateParam, pqDev);
@@ -588,11 +588,11 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
QueryWrapper<PqDev> queryWrapper = new QueryWrapper<>(); QueryWrapper<PqDev> queryWrapper = new QueryWrapper<>();
queryWrapper queryWrapper
.eq("state", DataStateEnum.ENABLE.getCode()) .eq("state", DataStateEnum.ENABLE.getCode())
.and(q -> q.eq("name", param.getName()) .and(q -> q.eq("name", param.getName()).or()
.eq("pattern", param.getPattern())
.eq("manufacturer", param.getManufacturer())
.eq("Dev_Type", param.getDevType()).or()
.eq("Create_Id", param.getCreateId())); //设备序列号重复 .eq("Create_Id", param.getCreateId())); //设备序列号重复
// .eq("pattern", param.getPattern())
// .eq("manufacturer", param.getManufacturer())
// .eq("Dev_Type", param.getDevType()).or()
if (isExcludeSelf) { if (isExcludeSelf) {
if (param instanceof PqDevParam.UpdateParam) { if (param instanceof PqDevParam.UpdateParam) {
queryWrapper.ne("id", ((PqDevParam.UpdateParam) param).getId()); queryWrapper.ne("id", ((PqDevParam.UpdateParam) param).getId());