From 02c8164b7ee7ff7c72f85f9ddb28a962e957db83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=90=8C=E5=AD=A6?= Date: Tue, 28 Oct 2025 10:01:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(device):=E4=BC=98=E5=8C=96=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E7=BA=BF=E8=B7=AF=E5=8F=B7=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E4=B8=8E=E9=87=8D=E5=A4=8D=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/gather/device/service/impl/PqDevServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 de4f04b3..d3a8e308 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 @@ -1272,6 +1272,8 @@ public class PqDevServiceImpl extends ServiceImpl implements .map(ContrastDevExcel::getPqMonitorExcelList) .filter(Objects::nonNull) .flatMap(List::stream) + // 过滤掉没有线路号的数据 + .filter(item -> ObjectUtil.isNotNull(item.getNum())) .collect(Collectors.toList()); // 取第一条为设备基本信息 ContrastDevExcel devExcel = devExcelList.get(0); @@ -1297,7 +1299,7 @@ public class PqDevServiceImpl extends ServiceImpl implements // 判断是否有重复的num Set uniqueNumSet = new HashSet<>(numList); if (uniqueNumSet.size() != numList.size()) { - throw new BusinessException(DetectionResponseEnum.MONITOR_NUM_REPEAT); + throw new BusinessException(DetectionResponseEnum.MONITOR_NUM_REPEAT, "【" + name + "】该被检设备下存在相同线路号的监测点！"); } Integer max = CollectionUtil.max(numList); Integer min = CollectionUtil.min(numList);