解决区域重复问题、及处理分数为0显示安全问题

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/FanHealthIndexServiceImpl.java

@@ -227,7 +227,7 @@ public class FanHealthIndexServiceImpl implements IFanHealthIndexService {
         List<IdxBizFanWeight> idxBizFanWeights = idxBizFanWeightMapper.selectList(idxBizFanWeightQueryWrapper);
         Map<String, Float> weightMap = idxBizFanWeights.stream().collect(Collectors.toMap(o -> o.getArae() + o.getStation() + o.getEquipmentName(), IdxBizFanWeight::getValue));
         // 开始计算加权平均
-        Map<String, List<FanHealthIndex>> fanHealthIndicesZxtMap = fanHealthIndicesZxt.stream().collect(Collectors.groupingBy(o -> o.getGatewayId() + o.getStation() + o.getAnalysisObjType() + o.getArea() + o.getOrgCode()));
+        Map<String, List<FanHealthIndex>> fanHealthIndicesZxtMap = fanHealthIndicesZxt.stream().collect(Collectors.groupingBy(o ->  o.getStation() + o.getAnalysisObjType() + o.getArea() + o.getOrgCode()));
         List<FanHealthIndex> fanHealthIndicesZxtNews = new ArrayList<>();
         fanHealthIndicesZxtMap.forEach((k, v) -> {
             FanHealthIndex fanHealthIndex = new FanHealthIndex();

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PvHealthIndexServiceImpl.java

@@ -220,7 +220,7 @@ public class PvHealthIndexServiceImpl implements IPvHealthIndexService {
         List<IdxBizPvWeight> idxBizFanWeights = idxBizPvWeightMapper.selectList(queryWrapper);
         Map<String, Float> weightMap = idxBizFanWeights.stream().collect(Collectors.toMap(o -> o.getArae() + o.getStation() + o.getEquipmentName(), IdxBizPvWeight::getValue));
         // 开始计算加权平均
-        Map<String, List<PvHealthIndex>> healthIndicesMap = pvHealthIndices.stream().collect(Collectors.groupingBy(o -> o.getGatewayId() + o.getStation() + o.getAnalysisObjType() + o.getArea() + o.getOrgCode()));
+        Map<String, List<PvHealthIndex>> healthIndicesMap = pvHealthIndices.stream().collect(Collectors.groupingBy(o ->  o.getStation() + o.getAnalysisObjType() + o.getArea() + o.getOrgCode()));
         List<PvHealthIndex> pvHealthIndexList = new ArrayList<>();
         healthIndicesMap.forEach((k, v) -> {
             PvHealthIndex pvHealthIndex = new PvHealthIndex();

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/TdengineTimeServiceImpl.java

@@ -274,7 +274,6 @@ public class TdengineTimeServiceImpl {
         healthStatusIndicatorServiceImpl.healthWarningDayGF();
     }
 
-
     private String getHealthLevelByScore(List<IdxBizFanHealthLevel> levelList, Double healthIndex) {
         String levelDesc = "安全";
         for (IdxBizFanHealthLevel item : levelList) {
@@ -282,7 +281,7 @@ public class TdengineTimeServiceImpl {
                 levelDesc = item.getHealthLevel();
                 break;
             }
-            if (healthIndex == 0 && item.getGroupLowerLimit() == healthIndex){
+            if (healthIndex == 0 && item.getGroupLowerLimit().equals(healthIndex)){
                 levelDesc = item.getHealthLevel();
                 break;
             }
@@ -460,6 +459,10 @@ public class TdengineTimeServiceImpl {
                 levelDesc = item.getHealthLevel();
                 break;
             }
+            if (healthIndex == 0 && item.getGroupLowerLimit().equals(healthIndex)){
+                levelDesc = item.getHealthLevel();
+                break;
+            }
         }
         return levelDesc;
     }