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);