调整数据中心算法

1.装置在线率算法-日表
2.终端异常通告算法-日表

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.harmonic.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -176,6 +177,24 @@ public class THDistortionServiceImpl implements THDistortionService {
         });
     }
 
+    /**
+     * 计算供电公司畸变率
+     */
+    private void setPowerDistortion(List<THDistortionVO> list) {
+        List<THDistortionVO> result = new ArrayList<>();
+        list.forEach(item->{
+            List<THDistortionVO> children = item.getChildren();
+            children.forEach(item2->{
+                result.addAll(item2.getChildren());
+            });
+            if (CollectionUtil.isNotEmpty(result)){
+                item.setDistortion(roundHalfUp(result.stream().filter(child -> !Objects.equals(child.getDistortion(), 3.14159)).mapToDouble(THDistortionVO::getDistortion).average().orElse(3.14159)));
+            } else {
+                item.setDistortion(3.14159);
+            }
+        });
+    }
+
     /**
      * 组装树层级
      */
@@ -224,8 +243,8 @@ public class THDistortionServiceImpl implements THDistortionService {
             setChildesList(substationList, monitorList);
             setFatherDistortion(substationList);
             powerCompanyList = powerCompanyList.stream().peek(item -> item.setChildren(getChildCategoryList(item, substationList))).collect(Collectors.toList());
-            setFatherDistortion(powerCompanyList);
-
+//            setFatherDistortion(powerCompanyList);
+            setPowerDistortion(powerCompanyList);
         }
         return powerCompanyList;
     }