From 38d8aec55adb0b7e7d3a3f25cff2ec443c18c916 Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Tue, 23 Sep 2025 10:57:40 +0800 Subject: [PATCH] =?UTF-8?q?/*=E5=B7=A1=E8=A7=86=E7=BB=93=E6=9E=9C=E8=A1=A8?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=B3=95=E7=BB=93=E6=9E=9C=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E4=BF=AE=E6=94=B9*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/utils/ResultAnalysisUtils.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 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 be48d32..da37a85 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 @@ -111,28 +111,38 @@ public class ResultAnalysisUtils { resultAnalysis.setPointStatus("1"); resultAnalysis.setResultType("1"); } else if (algType.equals("meter")) { - log.info("------------------parseAlg : meter"); - if (!algValue.isAlarm(value)) { - log.info("PARSE_ALG_METER_NO_ALARM value: {}", value); + log.info("------------------parseAlg : meter value: {}", value); + if("open".equals(value) + || "closed".equals(value)) { resultAnalysis.setResStatus("0"); resultAnalysis.setPointStatus("1"); resultAnalysis.setResultType("1"); defaultDesc = messageUtils.get("正常"); } else { - log.info("PARSE_ALG_METER_ALARM value: {}", value); - String[] valueArr = value.split(StringUtils.COMMA); - if(valueArr.length > 1) { - log.info("PARSE_ALG_METER_ALARM_VALUE_COMPOSITE value: {}", value); + if (!algValue.isAlarm(value)) { + log.info("PARSE_ALG_METER_NO_ALARM value: {}", value); resultAnalysis.setResStatus("0"); resultAnalysis.setPointStatus("1"); - resultAnalysis.setResultType("0"); + // result_type: 0-告警; 1-正常; 2-异常. 正常必然对应1 + resultAnalysis.setResultType("1"); defaultDesc = messageUtils.get("正常"); } else { + log.info("PARSE_ALG_METER_ALARM value: {}", value); + String[] valueArr = value.split(StringUtils.COMMA); + if(valueArr.length > 1) { + log.info("PARSE_ALG_METER_ALARM_VALUE_COMPOSITE value: {}", value); + resultAnalysis.setResStatus("0"); + resultAnalysis.setPointStatus("1"); + //resultAnalysis.setResultType("0"); + resultAnalysis.setResultType("1"); + defaultDesc = messageUtils.get("正常"); + } else { log.info("PARSE_ALG_METER_ALARM_VALUE_SINGLE value: {}", value); if(value.contains("分OFF")) { resultAnalysis.setResStatus("0"); resultAnalysis.setPointStatus("1"); - resultAnalysis.setResultType("0"); +// resultAnalysis.setResultType("0"); + resultAnalysis.setResultType("1"); defaultDesc = messageUtils.get("正常"); } else { try { @@ -146,10 +156,12 @@ public class ResultAnalysisUtils { log.info("PARSE_ALG_METER_ALARM_VALUE_SINGLE_NO_DIGIT value: {}", value); resultAnalysis.setResStatus("0"); resultAnalysis.setPointStatus("1"); - resultAnalysis.setResultType("0"); +// resultAnalysis.setResultType("0"); + resultAnalysis.setResultType("1"); defaultDesc = messageUtils.get("正常"); } } + } } } } else if (algType.equals("sound")) {