From 22656bd0c92175cae58c85b75f206489bcc25df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 25 Apr 2023 14:52:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=A4=84=E7=90=86=E6=B1=A1=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PollutionSubstationServiceImpl.java        | 6 +++---
 .../service/mysql/Impl/line/PollutionServiceImpl.java       | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
index b539403b8..d0126289d 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
@@ -48,7 +48,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/10/13  8:56【需求编号】
@@ -108,7 +108,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
         harmonicPublicParam.setServerName(generalInfo.getMicroServiceName());
         List<PollutionSubstationDTO> pollutionSubstationDTOList = new ArrayList<>();
         List<GeneralDeviceDTO> sub = generalDeviceInfoClient.getPracticalRunDeviceInfoAsSubstation(harmonicPublicParam).getData();
-        
+
         sub.forEach(item->{
             PollutionSubstationDTO pollutionSubstationDTO = lineFeignClient.getSubstationInfo(item.getIndex()).getData();
 
@@ -335,7 +335,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
     }
 
     private void setData(HarmonicPublicParam harmonicPublicParam, String pollutionType, String searchBeginTime, PollutionVO pollutionVO, String detpid) {
-        harmonicPublicParam.setReportFlag("5");
+        //harmonicPublicParam.setReportFlag("5");
         if(Objects.equals (harmonicPublicParam.getReportFlag (), BizParamConstant.STAT_BIZ_YEAR) ) {
             QueryWrapper<RStatPollutionOrgYPO> rStatPollutionOrgYPOQueryWrapper = new QueryWrapper<> ();
             rStatPollutionOrgYPOQueryWrapper.eq ("org_id", detpid).
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java
index 4a11a849b..1cda20b07 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java
@@ -320,6 +320,9 @@ public class PollutionServiceImpl implements PollutionService {
         if (!CollUtil.isEmpty(processDataList)){
             map.put("pollutionType",dictData.getId());
             map.put("value",processDataList.stream().max(Comparator.comparing(RMpPollutionDPO::getValue)).get().getValue());
+        }else {
+            map.put("pollutionType",dictData.getId());
+            map.put("value",0);
         }
     }