From 744c72dea2cfc1e94f5bbd142477d2de7bbca5b1 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 4 Jun 2025 22:15:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/gather/device/service/impl/PqDevServiceImpl.java | 6 +++++- .../com/njcn/gather/pojo/enums/DetectionResponseEnum.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java index f726ff30..73351f5e 100644 --- a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java @@ -736,6 +736,8 @@ public class PqDevServiceImpl extends ServiceImpl implements long count = newDevList.stream().filter(dev -> dev.getName().equals(pqDev.getName()) && dev.getCreateId().equals(pqDev.getCreateId())).count(); if (count == 0) { newDevList.add(pqDev); + } else { + throw new BusinessException(DetectionResponseEnum.NAME_OR_CREATEID_REPEAT); } } }); @@ -1077,9 +1079,11 @@ public class PqDevServiceImpl extends ServiceImpl implements param.setDevType(pqDev.getDevType()); this.checkRepeat(param, false); - long count = newDevList.stream().filter(dev -> dev.getName().equals(pqDev.getName()) && dev.getCreateId().equals(pqDev.getCreateId())).count(); + long count = newDevList.stream().filter(dev -> dev.getName().equals(pqDev.getName()) || dev.getCreateId().equals(pqDev.getCreateId())).count(); if (count == 0) { newDevList.add(pqDev); + } else { + throw new BusinessException(DetectionResponseEnum.NAME_OR_CREATEID_REPEAT); } } }); diff --git a/detection/src/main/java/com/njcn/gather/pojo/enums/DetectionResponseEnum.java b/detection/src/main/java/com/njcn/gather/pojo/enums/DetectionResponseEnum.java index 80c83434..a15a9d20 100644 --- a/detection/src/main/java/com/njcn/gather/pojo/enums/DetectionResponseEnum.java +++ b/detection/src/main/java/com/njcn/gather/pojo/enums/DetectionResponseEnum.java @@ -61,7 +61,8 @@ public enum DetectionResponseEnum { ERROR_SYSTEM_NOT_EXIST("A02069", "该误差体系不存在，请先添加该误差体系"), DATA_RULE_NOT_EXIST("A02070", "该数据处理原则不存在，请先在\"数据处理原则\"字典中添加"), REPORT_TEMPLATE_NOT_EXIST("A02071", "该报告模板不存在，请先添加该报告模板"), - LACK_REPORT_TEMPLATE_ID("A02072","当关联报告模板为\"是\"时，报告模板不能为空" ); + LACK_REPORT_TEMPLATE_ID("A02072","当关联报告模板为\"是\"时，报告模板不能为空" ), + NAME_OR_CREATEID_REPEAT("A02073","名称或装置编号重复" ); private final String code;