From f17be682469dc6df6d2c3e09f67906a2f1ab76dc Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Sat, 5 Sep 2026 14:07:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dinfrared=E8=AF=BB?= =?UTF-8?q?=E6=95=B0=E5=A4=B1=E8=B4=A5=E6=97=B6=E5=88=A4=E6=96=AD=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E8=80=8C=E4=B8=8D=E6=98=AF=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/utils/ResultAnalysisUtils.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java index ff74319..150ce66 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java @@ -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);