Merge branch 'developer' of http://36.40.66.175:5000/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/emqx/WarningRecordStatusMessage.java

@@ -90,6 +90,7 @@ public class WarningRecordStatusMessage extends EmqxListener {
             list.add(fanWarningRecord);
         }
         if(list.size()>0){
+            log.info("XXXXXXXXXXXX风电修改预警状态XXXXXXXXXXXXXXXXXX",JSON.toJSONString(list));
             fanWaringRecordMapper.updateStatusByTs(list);
         }
 
@@ -118,6 +119,7 @@ public class WarningRecordStatusMessage extends EmqxListener {
             list.add(pvWarningRecord);
         }
         if(list.size()>0){
+            log.info("XXXXXXXXXXXX光伏修改预警状态XXXXXXXXXXXXXXXXXX",JSON.toJSONString(list));
             pvWaringRecordMapper.updateStatusByTs(list);
         }
     }

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

@@ -540,9 +540,21 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
                     Double processValue1 = indicatorDataListMap.get(s + "_" + process1Address);
                     Double processValue2 = indicatorDataListMap.get(s + "_" + process2Address);
                     Double processValue3 = indicatorDataListMap.get(s + "_" + process3Address);
+                    if(ObjectUtils.isEmpty(analyseValue)){
+                        analyseValue=0.0;
+                    }
                     currentValueMap.put("analyseValue", keepOneKeepDecimalPlace(analyseValue));
+                    if(ObjectUtils.isEmpty(processValue1)){
+                        processValue1=0.0;
+                    }
                     currentValueMap.put("processValue1", keepOneKeepDecimalPlace(processValue1));
+                    if(ObjectUtils.isEmpty(processValue2)){
+                        processValue2=0.0;
+                    }
                     currentValueMap.put("processValue2", keepOneKeepDecimalPlace(processValue2));
+                    if(ObjectUtils.isEmpty(processValue3)){
+                        processValue3=0.0;
+                    }
                     currentValueMap.put("processValue3", keepOneKeepDecimalPlace(processValue3));
                     HashMap<String, String> trainValueMap = getWorkingConditionCombinationIntervalFan(processValue1, processValue2, processValue3, idxBizFanPointVarCentralValueList);
                     trainValueMap.put("time", s);
@@ -599,9 +611,21 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
                     Double processValue1 = indicatorDataListMap.get(s + "_" + process1Address);
                     Double processValue2 = indicatorDataListMap.get(s + "_" + process2Address);
                     Double processValue3 = indicatorDataListMap.get(s + "_" + process3Address);
+                    if(ObjectUtils.isEmpty(analyseValue)){
+                        analyseValue = 0.0;
+                    }
                     currentValueMap.put("analyseValue", keepOneKeepDecimalPlace(analyseValue));
+                    if(ObjectUtils.isEmpty(processValue1)){
+                        processValue1 = 0.0;
+                    }
                     currentValueMap.put("processValue1", keepOneKeepDecimalPlace(processValue1));
+                    if(ObjectUtils.isEmpty(analyseValue)){
+                        processValue2 = 0.0;
+                    }
                     currentValueMap.put("processValue2", keepOneKeepDecimalPlace(processValue2));
+                    if(ObjectUtils.isEmpty(processValue3)){
+                        processValue3 = 0.0;
+                    }
                     currentValueMap.put("processValue3", keepOneKeepDecimalPlace(processValue3));
                     HashMap<String, String> trainValueMap = getWorkingConditionCombinationIntervalPv(processValue1, processValue2, processValue3, idxBizPvPointVarCentralValueList);
                     trainValueMap.put("time", s);