From cfbe643eddb3c898ba24507b7a1f6ea72a0010df Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Thu, 30 May 2024 13:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97=E5=9B=BD=E7=BD=91=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PqTypicalSourceCreatePOServiceImpl.java |  4 ++--
 .../impl/PointStatisticalDataServiceImpl.java    |  2 +-
 .../upload/impl/REvaluationDataServiceImpl.java  |  4 ++--
 .../RSubstationStatisticalDataServiceImpl.java   |  2 --
 .../RUploadPointStatisticalDataDServiceImpl.java | 16 ++++++++++++++--
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java
index 30a0d5422..cc3c42143 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java
@@ -137,7 +137,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
                     .eq(PqTypicalSourceCreatePO::getComputeDate,uploadParam.getTime())
                     .in(PqTypicalSourceCreatePO::getId,uploadParam.getList())
                     .isNotNull(PqTypicalSourceCreatePO::getComputeDate)
-                    .in(PqTypicalSourceCreatePO::getStatisticalLevel,Stream.of("3","4").collect(Collectors.toList()))
+                    .in(PqTypicalSourceCreatePO::getStatisticalLevel,Stream.of("3","4","5").collect(Collectors.toList()))
                     .list();
         }
         //未指定数据上送,则将所有未上送的数据,上送上去
@@ -145,7 +145,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
             list = this.lambdaQuery()
                     .eq(PqTypicalSourceCreatePO::getComputeDate,uploadParam.getTime())
                     .isNotNull(PqTypicalSourceCreatePO::getComputeDate)
-                    .in(PqTypicalSourceCreatePO::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
+                    .in(PqTypicalSourceCreatePO::getStatisticalLevel, Stream.of("3","4","5").collect(Collectors.toList()))
                     .list();
         }
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
index bd8c7f2f5..dd38fa812 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
@@ -88,7 +88,7 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl<RUploadPointSta
         else {
             list = this.lambdaQuery()
                     .eq(RUploadPointStatisticalDataD::getComputeDate,param.getTime())
-                    .in(RUploadPointStatisticalDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
+                    .in(RUploadPointStatisticalDataD::getStatisticalLevel, Stream.of("3","4","5").collect(Collectors.toList()))
                     .list();
         }
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
index 3b3a97436..c4099fefb 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
@@ -130,11 +130,11 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
                     .in(RUploadEvaluationDataD::getId, param.getList())
                     .list();
         }
-        //未指定数据上送,则上送省级数据(包含日、月数据)
+        //未指定数据上送,则上送省市县级数据(包含日、月数据)
         else {
             list = this.lambdaQuery()
                     .eq(RUploadEvaluationDataD::getComputeDate, param.getTime())
-                    .in(RUploadEvaluationDataD::getStatisticalLevel, Stream.of("3", "4").collect(Collectors.toList()))
+                    .in(RUploadEvaluationDataD::getStatisticalLevel, Stream.of("3", "4","5").collect(Collectors.toList()))
                     .list();
         }
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
index 6dbe2dc2f..b3f413087 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
@@ -82,9 +82,7 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl<RUploadSu
         else {
             list = this.lambdaQuery()
                     .eq(RUploadSubstationStatisticalDataD::getStatisticalDate,param.getTime())
-                    //.eq(RUploadSubstationStatisticalDataD::getCityId,"")
                     .isNotNull(RUploadSubstationStatisticalDataD::getComputeDate)
-                    .eq(RUploadSubstationStatisticalDataD::getCountyId,"")
                     .list();
         }
         //以尺寸100分片
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
index 53843095b..afb6a4241 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
@@ -315,6 +315,7 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
         List<RUploadPointStatisticalDataD> resultPO = new ArrayList<>();
         pmsRunStatisticMap.forEach((deptId,item)->{
             PvTerminalTreeVO dept = deptMap.get(deptId);
+
             //跳过全国这个单位
             if (Objects.equals(Integer.parseInt(UploadEnum.NJCN_DEPT_LEVEL_1.getCode()), dept.getLevel())) {
                 return;
@@ -322,7 +323,13 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
             List<String> runMonitorIds = Arrays.stream(StrUtil.isNotBlank(item.getRunMonitorIds())?item.getRunMonitorIds().split(StrUtil.COMMA):new String[]{}).collect(toList());
             List<String> onlineMonitorIds = Arrays.stream(StrUtil.isNotBlank(item.getOnlineMonitorIds())?item.getOnlineMonitorIds().split(StrUtil.COMMA):new String[]{}).collect(toList());
             List<String> runDevIds = Arrays.stream(StrUtil.isNotBlank(item.getRunDevIds())?item.getRunDevIds().split(StrUtil.COMMA):new String[]{}).collect(toList());
-            List<LineDTO> lineDTOList = commLineClient.getLineDetailBatch(onlineMonitorIds).getData();
+
+            List<LineDTO> lineDTOList;
+            if(CollUtil.isNotEmpty(onlineMonitorIds)) {
+                lineDTOList = commLineClient.getLineDetailBatch(onlineMonitorIds).getData();
+            }else {
+                lineDTOList = new ArrayList<>();
+            }
 
             List<RStatIntegrityD> deptRStatIntegrityDList = rStatIntegrityDList.stream().filter(it->runMonitorIds.contains(it.getLineIndex())).collect(toList());
 
@@ -461,7 +468,12 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
             List<String> runMonitorIds = Arrays.stream(StrUtil.isNotBlank(item.getRunMonitorIds())?item.getRunMonitorIds().split(StrUtil.COMMA):new String[]{}).collect(toList());
             List<String> onlineMonitorIds = Arrays.stream(StrUtil.isNotBlank(item.getOnlineMonitorIds())?item.getOnlineMonitorIds().split(StrUtil.COMMA):new String[]{}).collect(toList());
             List<String> runDevIds = Arrays.stream(StrUtil.isNotBlank(item.getRunDevIds())?item.getRunDevIds().split(StrUtil.COMMA):new String[]{}).collect(toList());
-            List<LineDTO> lineDTOList = commLineClient.getLineDetailBatch(onlineMonitorIds).getData();
+            List<LineDTO> lineDTOList;
+            if(CollUtil.isNotEmpty(onlineMonitorIds)) {
+                lineDTOList = commLineClient.getLineDetailBatch(onlineMonitorIds).getData();
+            }else {
+                lineDTOList = new ArrayList<>();
+            }
 
             List<RStatIntegrityD> deptRStatIntegrityDList = rStatIntegrityDList.stream().filter(it->runMonitorIds.contains(it.getLineIndex())).collect(toList());
             int due = deptRStatIntegrityDList.stream().mapToInt(RStatIntegrityD::getDueTime).sum();