From f840ab9774db982255d73fe961dad55b8c807246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Mon, 22 May 2023 20:23:06 +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

---
 .../device/pq/mapper/mapping/TreeMapper.xml   | 12 ++++--
 .../service/impl/HarmonicServiceImpl.java     | 37 ++++++++++---------
 .../impl/PollutionSubstationServiceImpl.java  |  6 ++-
 .../user/service/impl/DeptServiceImpl.java    |  2 +-
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml
index 5ce660ac6..35e5a5c86 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml
@@ -382,13 +382,17 @@
             line.sort,
             line.pids,
             CONCAT(voltage.name, '_', line.name) name,
-            comFlag.Com_Flag
+            comFlag.Com_Flag,
+            detail.pt_type
         FROM
             pq_line line,
+            pq_line_detail detail,
             pq_line voltage,
             pq_line device,
             pq_device comFlag
         WHERE
+            line.id = detail.id
+          AND
             line.pid = voltage.id
           AND
             voltage.pid = device.id
@@ -399,9 +403,9 @@
                 #{item}
             </foreach>
     </select>
-    
-    
-    
+
+
+
     <!--根据监测点索引集合获取监测点详细参数-->
     <select id="getDetailedParametersForLine" resultType="com.njcn.device.pq.pojo.vo.LineIntegrityDataVO">
         select *
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java
index f28cd063a..e58257800 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java
@@ -88,11 +88,12 @@ public class HarmonicServiceImpl implements IHarmonicService {
 
         List<RStatLimitTargetDPO> finalAllData = allData;
         deptList.forEach(dept->{
-            List<PollutionVO> childrenList = new ArrayList<>();
-            PollutionVO pollutionVO = new PollutionVO();
-            pollutionVO.setId(dept.getIndex());
-            pollutionVO.setName(dept.getName());
+
             if (!CollectionUtils.isEmpty(dept.getSubIndexes())){
+                List<PollutionVO> childrenList = new ArrayList<>();
+                PollutionVO pollutionVO = new PollutionVO();
+                pollutionVO.setId(dept.getIndex());
+                pollutionVO.setName(dept.getName());
                 dept.getSubIndexes().forEach(sub->{
                     List<PollutionLineDTO> l1 = map.get(sub);
                     PollutionVO children = new PollutionVO();
@@ -108,15 +109,17 @@ public class HarmonicServiceImpl implements IHarmonicService {
                     children.setData(handleDataNew(collect,sumList,harmonicPublicParam.getStatisticalType().getCode()).getRatio());
                     childrenList.add(children);
                 });
-            }
-            if (!CollectionUtils.isEmpty(childrenList)){
-                pollutionVO.setChildren(childrenList.stream().sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList()));
-            }
-            if (!CollectionUtils.isEmpty(dept.getLineIndexes())){
+
+                if (!CollectionUtils.isEmpty(childrenList)){
+                    pollutionVO.setChildren(childrenList.stream().sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList()));
+                }
+                if (!CollectionUtils.isEmpty(dept.getLineIndexes())){
 //                pollutionVO.setData(handleData(getLimitTarget(lineList, harmonicPublicParam.getSearchBeginTime(),harmonicPublicParam.getSearchEndTime()),harmonicPublicParam.getStatisticalType().getCode(),lineList, harmonicPublicParam.getSearchBeginTime(),harmonicPublicParam.getSearchEndTime()).getRatio());
-                pollutionVO.setData(NumberUtil.round(childrenList.stream().mapToDouble(PollutionVO::getData).average().orElse(3.14159),2).doubleValue());
+                    pollutionVO.setData(NumberUtil.round(childrenList.stream().mapToDouble(PollutionVO::getData).average().orElse(3.14159),2).doubleValue());
+                }
+                list.add(pollutionVO);
             }
-            list.add(pollutionVO);
+
         });
         if (!CollectionUtils.isEmpty(list)){
             return list.stream().sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList());
@@ -145,10 +148,9 @@ public class HarmonicServiceImpl implements IHarmonicService {
         List<RStatLimitTargetDPO> finalAllData = allData;
         deptList.forEach(item->{
             List<String> lineList = item.getLineIndexes();
-            HarmonicDeptVO harmonicDeptVO = new HarmonicDeptVO();
         if (!CollectionUtils.isEmpty(lineList)){
 
-
+            HarmonicDeptVO harmonicDeptVO = new HarmonicDeptVO();
             List<RStatLimitTargetDPO> collect = limitTargetNew.stream().filter(x -> lineList.contains(x.getLineId())).collect(Collectors.toList());
 
             List<RStatLimitTargetDPO> sumList = finalAllData.stream().filter(x -> lineList.contains(x.getLineId())).collect(Collectors.toList());
@@ -156,10 +158,11 @@ public class HarmonicServiceImpl implements IHarmonicService {
             AreaDTO areaDTO = handleDataNew(collect, sumList, param.getStatisticalType().getCode());
 
             BeanUtil.copyProperties(areaDTO,harmonicDeptVO);
+            harmonicDeptVO.setId(item.getIndex());
+            harmonicDeptVO.setName(item.getName());
+            list.add(harmonicDeptVO);
         }
-        harmonicDeptVO.setId(item.getIndex());
-        harmonicDeptVO.setName(item.getName());
-        list.add(harmonicDeptVO);
+
     });
         if (!CollectionUtils.isEmpty(list)){
         return list.stream().sorted(Comparator.comparing(HarmonicDeptVO::getRatio).reversed().thenComparing(HarmonicDeptVO::getOnlineCount).thenComparing(HarmonicDeptVO::getOverLineCount)).collect(Collectors.toList());
@@ -586,7 +589,7 @@ public class HarmonicServiceImpl implements IHarmonicService {
             sum = targetDMapper.getSumV(lineList, startTime, endTime);
 
         } else if (Objects.equals(type, DicDataEnum.XBDL_ENUM.getCode())){
-            sum = targetDMapper.getSumV(lineList, startTime, endTime);
+            sum = targetDMapper.getSumI(lineList, startTime, endTime);
 
         }
         if(CollUtil.isNotEmpty(sum)){
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 e4208e5f9..efcb2a58f 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
@@ -232,10 +232,14 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
             harmonicPublicParam.setServerName(generalInfo.getMicroServiceName());
             List<GeneralDeviceDTO> sub = generalDeviceInfoClient.getPracticalRunDeviceInfo(harmonicPublicParam).getData();
             for (GeneralDeviceDTO temp : sub) {
+                List<String> subIndexes = temp.getSubIndexes();
+                if(CollectionUtil.isEmpty(subIndexes)){
+                    continue;
+                }
                 PollutionVO pollutionVO = new PollutionVO();
                 String detpid = temp.getIndex();
                 String name = temp.getName();
-                List<String> subIndexes = temp.getSubIndexes();
+
                 pollutionVO.setId(detpid);
                 pollutionVO.setName(name);
                 pollutionVO.setData(-1.0);
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
index d5ac09343..f5d04e0fd 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
@@ -321,7 +321,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
                     if (deptVo.getType() == 0) {
                         deptVo.setName(deptVo.getAreaName());
                     }
-                }).collect(Collectors.toList());
+                }).sorted(Comparator.comparing(DeptTreeVO::getSort)).collect(Collectors.toList());
     }
 
     /**