diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java index 8fcfd835c..75acf0b6f 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java @@ -118,6 +118,13 @@ public class IntegrityServiceImpl extends MppServiceImpl Objects.equals(item.getPointId(), item2.getLineId())) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadSubstationStatisticalDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadSubstationStatisticalDataDServiceImpl.java index f0c16d342..2631f5c97 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadSubstationStatisticalDataDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadSubstationStatisticalDataDServiceImpl.java @@ -114,6 +114,7 @@ public class RUploadSubstationStatisticalDataDServiceImpl extends MppServiceImpl rUploadSubstationStatisticalDataD.setUploadStatus(Integer.parseInt(UploadEnum.UPLOAD_STATUS_0.getCode())); if(pmsRunStatisticMap.containsKey(k)){ + System.out.println("进入当前步骤++++++++++++++++++++"); String runMonitorIds = pmsRunStatisticMap.get(dept.getCode()).getRunMonitorIds(); if(StrUtil.isNotBlank(runMonitorIds)){ ArrayList list1 = CollectionUtil.toList(runMonitorIds.split(StrUtil.COMMA)); @@ -123,7 +124,9 @@ public class RUploadSubstationStatisticalDataDServiceImpl extends MppServiceImpl } }else{ //计算在线监测点数 + System.out.println("临时测试---------------"+deptChildren.size()); List l = deptChildren.get(k).get(0).getLineBaseList(); + if (CollUtil.isNotEmpty(l)){ l = l.stream().filter(o->Objects.equals(o.getIsUpToGrid(),1)).collect(Collectors.toList()); rUploadSubstationStatisticalDataD.setOnlineMonitorNum(l.size());