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")) {