|
|
|
@ -295,24 +295,24 @@ public class ResultAnalysisUtils { |
|
|
|
} else if ( |
|
|
|
AlgConstants.ALG_INFRARED_LIST.contains(algType) || |
|
|
|
algType.equals("xb")) { |
|
|
|
if (!algValue.isAlarm(value)) { |
|
|
|
log.info("infrared no alarm value: {}, algValue: {}", value, algValue); |
|
|
|
resultAnalysis.setResStatus("1"); |
|
|
|
resultAnalysis.setPointStatus("1"); |
|
|
|
resultAnalysis.setResultType("1"); |
|
|
|
//defaultDesc = device + messageUtils.get("正常"); |
|
|
|
defaultDesc = messageUtils.get("正常"); |
|
|
|
if (NumberUtils.isCreatable(value)) { |
|
|
|
if (!algValue.isAlarm(value)) { |
|
|
|
log.info("infrared no alarm value: {}, algValue: {}", value, algValue); |
|
|
|
resultAnalysis.setResStatus("1"); |
|
|
|
resultAnalysis.setPointStatus("1"); |
|
|
|
resultAnalysis.setResultType("1"); |
|
|
|
defaultDesc = messageUtils.get("正常"); |
|
|
|
} else { |
|
|
|
log.info("infrared alarm value: {}, algValue: {}", value, algValue); |
|
|
|
resultAnalysis.setResStatus("0"); |
|
|
|
resultAnalysis.setPointStatus(PointStatusEnum.DEFECT.getCode()); |
|
|
|
resultAnalysis.setResultType("0"); |
|
|
|
defaultDesc = messageUtils.get("温度异常告警"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
log.info("infrared alarm value: {}, algValue: {}", value, algValue); |
|
|
|
resultAnalysis.setResStatus("0"); |
|
|
|
//resultAnalysis.setPointStatus("2"); |
|
|
|
resultAnalysis.setPointStatus(PointStatusEnum.DEFECT.getCode()); |
|
|
|
resultAnalysis.setResultType("0"); |
|
|
|
//defaultDesc = device + messageUtils.get("告警"); |
|
|
|
defaultDesc = messageUtils.get("温度异常告警"); |
|
|
|
} |
|
|
|
if (messageUtils.get("分析失败").equals(defaultDesc)) { |
|
|
|
defaultDesc = "--"; |
|
|
|
resultAnalysis.setPointStatus(PointStatusEnum.ABNORMAL.getCode()); |
|
|
|
resultAnalysis.setResultType(ResultTypeEnum.ABNORMAL.getCode()); |
|
|
|
resultAnalysis.setResStatus(ResStatusEnum.UNCONFIRM.getCode()); |
|
|
|
} |
|
|
|
} else if (algType.equals("isolator")) { |
|
|
|
log.info("ALG_TYPE isolator value: {}", value); |
|
|
|
|