预警代码调整

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

@@ -11,6 +11,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -80,17 +81,24 @@ public class HealthStatusIndicatorServiceImpl {
         wrapper.orderByDesc(IdxBizPvHealthIndex::getRecDate);
         List<IdxBizPvHealthIndex> healthIndices = idxBizPvHealthIndexMapper.selectList(wrapper);
 
+        if (null == healthIndices ){
+            return;
+        }
         Map<String, Map<String, List<IdxBizPvHealthIndex>>> gateWayMaps = healthIndices.stream().collect(Collectors.groupingBy(IdxBizPvHealthIndex::getGatewayId, Collectors.groupingBy(IdxBizPvHealthIndex::getIndexAddress)));
         for (String gateWayId : gateWayMaps.keySet()) {
             Map<String, List<IdxBizPvHealthIndex>> healthDataMaps = gateWayMaps.get(gateWayId);
             for (String address : healthDataMaps.keySet()) {
                 List<IdxBizPvHealthIndex> idxBizPvHealthIndices = healthDataMaps.get(address);
                 LambdaQueryWrapper<IdxBizPvWarningRuleSet> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(IdxBizPvWarningRuleSet::getAnalysisType,"按小时");
+                queryWrapper.eq(IdxBizPvWarningRuleSet::getAnalysisType,"按时刻");
                 queryWrapper.eq(IdxBizPvWarningRuleSet::getAnalysisPointId,idxBizPvHealthIndices.get(0).getAnalysisObjSeq());
                 List<IdxBizPvWarningRuleSet> idxBizPvWarningRuleSets = idxBizPvWarningRuleSetMapper.selectList(queryWrapper);
 
 
+                if (null == idxBizPvWarningRuleSets ){
+                    break;
+                }
+
                 Double healthValueWarn = 0.0;
                 Double healthValueRisk = 0.0;
                 Double healthValueNotice = 0.0;
@@ -103,15 +111,15 @@ public class HealthStatusIndicatorServiceImpl {
                 for (IdxBizPvWarningRuleSet e : idxBizPvWarningRuleSets) {
                     switch (e.getWarningName()){
                         case "警告":
-                            healthValueWarn = Double.parseDouble(e.getWarningIf().substring(e.getWarningIf().length()-2));
+                            healthValueWarn = Double.parseDouble(e.getWarningIf().substring(2));
                             healthValueMinCount =Long.parseLong(e.getWarningCycle());
                             break;
                         case "危险":
-                            healthValueRisk = Double.parseDouble(e.getWarningIf().substring(e.getWarningIf().length()-2));
+                            healthValueRisk = Double.parseDouble(e.getWarningIf().substring(2));
                             healthValueMinCount =Long.parseLong(e.getWarningCycle());
                             break;
                         case "注意":
-                            healthValueNotice = Double.parseDouble(e.getWarningIf().substring(e.getWarningIf().length()-2));
+                            healthValueNotice = Double.parseDouble(e.getWarningIf().substring(2));
                             healthValueMinCount =Long.parseLong(e.getWarningCycle());
                             break;
                     }
@@ -184,6 +192,10 @@ public class HealthStatusIndicatorServiceImpl {
         wrapper.orderByDesc(IdxBizPvHealthIndex::getRecDate);
         List<IdxBizPvHealthIndex> healthIndices = idxBizPvHealthIndexMapper.selectList(wrapper);
 
+        if (null == healthIndices ){
+            return;
+        }
+
         Map<String, Map<String, List<IdxBizPvHealthIndex>>> gateWayMaps = healthIndices.stream().collect(Collectors.groupingBy(IdxBizPvHealthIndex::getGatewayId, Collectors.groupingBy(IdxBizPvHealthIndex::getIndexAddress)));
         for (String gateWayId : gateWayMaps.keySet()) {
             Map<String, List<IdxBizPvHealthIndex>> healthDataMaps = gateWayMaps.get(gateWayId);
@@ -197,6 +209,10 @@ public class HealthStatusIndicatorServiceImpl {
                 List<IdxBizPvWarningRuleSet> idxBizPvWarningRuleSets = idxBizPvWarningRuleSetMapper.selectList(queryWrapper);
 
 
+                if (null == idxBizPvWarningRuleSets ){
+                    break;
+                }
+
                 Double healthValueWarn = 0.0;
                 Double healthValueRisk = 0.0;
                 Double healthValueNotice = 0.0;
@@ -292,6 +308,11 @@ public class HealthStatusIndicatorServiceImpl {
         wrapper.orderByDesc(IdxBizPvHealthIndex::getRecDate);
         List<IdxBizPvHealthIndex> healthIndices = idxBizPvHealthIndexMapper.selectList(wrapper);
 
+
+        if (null == healthIndices ){
+            return;
+        }
+
         Map<String, Map<String, List<IdxBizPvHealthIndex>>> gateWayMaps = healthIndices.stream().collect(Collectors.groupingBy(IdxBizPvHealthIndex::getGatewayId, Collectors.groupingBy(IdxBizPvHealthIndex::getIndexAddress)));
         for (String gateWayId : gateWayMaps.keySet()) {
             Map<String, List<IdxBizPvHealthIndex>> healthDataMaps = gateWayMaps.get(gateWayId);
@@ -305,6 +326,10 @@ public class HealthStatusIndicatorServiceImpl {
                 List<IdxBizPvWarningRuleSet> idxBizPvWarningRuleSets = idxBizPvWarningRuleSetMapper.selectList(queryWrapper);
 
 
+                if (null == idxBizPvWarningRuleSets ){
+                    break;
+                }
+
                 Double healthValueWarn = 0.0;
                 Double healthValueRisk = 0.0;
                 Double healthValueNotice = 0.0;
@@ -378,7 +403,7 @@ public class HealthStatusIndicatorServiceImpl {
     }
 
 
-    @Scheduled(cron = "0 0/5 * * * ?")
+    @Scheduled(cron = "0 0 */1 * * ?")
     @Async("async")
     public void healthWarningMinute() {
         Calendar calendar = Calendar.getInstance();
@@ -392,6 +417,10 @@ public class HealthStatusIndicatorServiceImpl {
         wrapper.orderByDesc(IdxBizFanHealthIndex::getRecDate);
         List<IdxBizFanHealthIndex> healthIndices = idxBizFanHealthIndexMapper.selectList(wrapper);
 
+        if (ObjectUtils.isEmpty(healthIndices)){
+            return;
+        }
+
         Map<String, Map<String, List<IdxBizFanHealthIndex>>> gateWayMaps = healthIndices.stream().collect(Collectors.groupingBy(IdxBizFanHealthIndex::getGatewayId, Collectors.groupingBy(IdxBizFanHealthIndex::getIndexAddress)));
         for (String gateWayId : gateWayMaps.keySet()) {
             Map<String, List<IdxBizFanHealthIndex>> healthDataMaps = gateWayMaps.get(gateWayId);
@@ -404,6 +433,10 @@ public class HealthStatusIndicatorServiceImpl {
                 List<IdxBizFanWarningRuleSet> idxBizPvWarningRuleSets = idxBizFanWarningRuleSetMapper.selectList(queryWrapper);
 
 
+                if (ObjectUtils.isEmpty(idxBizPvWarningRuleSets)){
+                    break;
+                }
+
                 Double healthValueWarn = 0.0;
                 Double healthValueRisk = 0.0;
                 Double healthValueNotice = 0.0;
@@ -416,15 +449,15 @@ public class HealthStatusIndicatorServiceImpl {
                 for (IdxBizFanWarningRuleSet e : idxBizPvWarningRuleSets) {
                     switch (e.getWarningName()){
                         case "警告":
-                            healthValueWarn = Double.parseDouble(e.getWarningIf().substring(e.getWarningIf().length()-2));
+                            healthValueWarn = Double.parseDouble(e.getWarningIf().substring(2));
                             healthValueMinCount =Long.parseLong(e.getWarningCycle());
                             break;
                         case "危险":
-                            healthValueRisk = Double.parseDouble(e.getWarningIf().substring(e.getWarningIf().length()-2));
+                            healthValueRisk = Double.parseDouble(e.getWarningIf().substring(2));
                             healthValueMinCount =Long.parseLong(e.getWarningCycle());
                             break;
                         case "注意":
-                            healthValueNotice = Double.parseDouble(e.getWarningIf().substring(e.getWarningIf().length()-2));
+                            healthValueNotice = Double.parseDouble(e.getWarningIf().substring(2));
                             healthValueMinCount =Long.parseLong(e.getWarningCycle());
                             break;
                     }
@@ -500,6 +533,9 @@ public class HealthStatusIndicatorServiceImpl {
         wrapper.orderByDesc(IdxBizFanHealthIndex::getRecDate);
         List<IdxBizFanHealthIndex> healthIndices = idxBizFanHealthIndexMapper.selectList(wrapper);
 
+        if (ObjectUtils.isEmpty(healthIndices)){
+            return;
+        }
         Map<String, Map<String, List<IdxBizFanHealthIndex>>> gateWayMaps = healthIndices.stream().collect(Collectors.groupingBy(IdxBizFanHealthIndex::getGatewayId, Collectors.groupingBy(IdxBizFanHealthIndex::getIndexAddress)));
         for (String gateWayId : gateWayMaps.keySet()) {
             Map<String, List<IdxBizFanHealthIndex>> healthDataMaps = gateWayMaps.get(gateWayId);
@@ -511,7 +547,9 @@ public class HealthStatusIndicatorServiceImpl {
                 queryWrapper.eq(IdxBizFanWarningRuleSet::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
                 List<IdxBizFanWarningRuleSet> idxBizPvWarningRuleSets = idxBizFanWarningRuleSetMapper.selectList(queryWrapper);
 
-
+                if (ObjectUtils.isEmpty(idxBizPvWarningRuleSets)){
+                    break;
+                }
                 Double healthValueWarn = 0.0;
                 Double healthValueRisk = 0.0;
                 Double healthValueNotice = 0.0;
@@ -607,7 +645,9 @@ public class HealthStatusIndicatorServiceImpl {
         wrapper.ge(IdxBizFanHealthIndex::getRecDate,df.format(calendar.getTime()));
         wrapper.orderByDesc(IdxBizFanHealthIndex::getRecDate);
         List<IdxBizFanHealthIndex> healthIndices = idxBizFanHealthIndexMapper.selectList(wrapper);
-
+        if (ObjectUtils.isEmpty(healthIndices)){
+            return;
+        }
         Map<String, Map<String, List<IdxBizFanHealthIndex>>> gateWayMaps = healthIndices.stream().collect(Collectors.groupingBy(IdxBizFanHealthIndex::getGatewayId, Collectors.groupingBy(IdxBizFanHealthIndex::getIndexAddress)));
         for (String gateWayId : gateWayMaps.keySet()) {
             Map<String, List<IdxBizFanHealthIndex>> healthDataMaps = gateWayMaps.get(gateWayId);
@@ -619,7 +659,9 @@ public class HealthStatusIndicatorServiceImpl {
                 queryWrapper.eq(IdxBizFanWarningRuleSet::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
                 List<IdxBizFanWarningRuleSet> idxBizPvWarningRuleSets = idxBizFanWarningRuleSetMapper.selectList(queryWrapper);
 
-
+                if (ObjectUtils.isEmpty(idxBizPvWarningRuleSets)){
+                    break;
+                }
                 Double healthValueWarn = 0.0;
                 Double healthValueRisk = 0.0;
                 Double healthValueNotice = 0.0;