From 99b56bffacbddae3a10d74aae5d2b87387d13182 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Sat, 12 Oct 2024 13:37:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=AE=97=E6=B3=95=E9=97=AE=E9=A2=98=E6=8E=92?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/mysql/Impl/line/IntegrityServiceImpl.java      | 7 +++++++
 .../impl/RUploadSubstationStatisticalDataDServiceImpl.java | 3 +++
 2 files changed, 10 insertions(+)

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<RStatIntegrityDMapper,
                                 RStatIntegrityD integrityDpo = new RStatIntegrityD();
                                 integrityDpo.setTimeId(LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
                                 integrityDpo.setLineIndex(item.getPointId());
+                                if(Objects.isNull(item.getInterval())){
+                                    System.out.println("遇到空指针异常+++++++++++++++++++++++++++++++++"+item);
+                                    System.out.println("遇到空指针异常+++++++++++++++++++++++++++++++++"+item);
+                                    System.out.println("遇到空指针异常+++++++++++++++++++++++++++++++++"+item);
+
+                                    System.out.println(item.getPointId());
+                                }
                                 integrityDpo.setDueTime(InfluxDBTableConstant.DAY_MINUTE / item.getInterval());
                                 integrityDpo.setRealTime(countList.stream()
                                         .filter(item2 -> 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<String> list1 = CollectionUtil.toList(runMonitorIds.split(StrUtil.COMMA));
@@ -123,7 +124,9 @@ public class RUploadSubstationStatisticalDataDServiceImpl extends MppServiceImpl
                     }
                 }else{
                     //计算在线监测点数
+                    System.out.println("临时测试---------------"+deptChildren.size());
                     List<LineDevGetDTO> 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());