From 57ac6fd4f7ce281c8a5c0ede411d305e10414d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Thu, 9 Mar 2023 08:57:30 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RStatBusbarHarmonicServiceImpl.java       | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
index 2255d47ea..e934e99fb 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -68,7 +69,6 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
             if (CollUtil.isEmpty(dto.getGeneratrixIdList())) {
                 continue;
             }
-
             PmsGeneratrixParam pmsGeneratrixParam = new PmsGeneratrixParam();
             pmsGeneratrixParam.setGeneratrixIds(dto.getGeneratrixIdList());
             pmsGeneratrixParam.setPowerStationVoltageLevel(param.getVoltageLevel());
@@ -78,7 +78,6 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
             List<RStatBusbarHarmonicYPO> info = rStatBusbarHarmonicMapper.getRStatBusbarHarmonic(param.getStartTime(), param.getEndTime(), dto.getGeneratrixIdList());
 
 
-
             for (GeneratrixAndPowerStationDTO generatrixAndPowerStationDTO : dtoS) {
                 boolean flag = false;
                 RStatBusbarHarmonicYVO vo = new RStatBusbarHarmonicYVO();
@@ -89,7 +88,6 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
                 vo.setDeptName(generatrixAndPowerStationDTO.getOrgName());
                 for (RStatBusbarHarmonicYPO po : info) {
                     if (generatrixAndPowerStationDTO.getGeneratrixId().equals(po.getBusbarId())){
-                        flag = true;
                         vo.setBusbarId(po.getBusbarId());
                         vo.setDataDate(po.getDataDate());
                         vo.setVEffectiveMax(po.getVEffectiveMax());
@@ -111,19 +109,11 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
                         break;
                     }
                 }
-
-                if(!flag){
-
-                }
                 result.add(vo);
             }
         }
-        // 取出母线id
-        //List<String> busbarIds = result.stream().map(RStatBusbarHarmonicYVO::getBusbarId).collect(Collectors.toList());
-
-
-
 
+        result = result.stream().sorted(Comparator.comparing(RStatBusbarHarmonicYVO::getDeptName)).collect(Collectors.toList());
         return result;
     }