Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java

@@ -120,12 +120,18 @@ public class ResultAnalysisUtils {
                 defaultDesc = messageUtils.get("正常");
             } else {
                 if (!algValue.isAlarm(value)) {
-                    log.info("PARSE_ALG_METER_NO_ALARM value: {}", value);
-                    resultAnalysis.setResStatus("0");
-                    resultAnalysis.setPointStatus("1");
-                    // result_type: 0-告警; 1-正常; 2-异常. 正常必然对应1
-                    resultAnalysis.setResultType("1");
-                    defaultDesc = messageUtils.get("正常");
+                    log.info("PARSE_ALG_METER_NO_ALARM value: {}, defaultDesc: {}", value, defaultDesc);
+                    if(StringUtils.isNotEmpty(defaultDesc) && defaultDesc.contains("失败")) {
+                        resultAnalysis.setResStatus("0");
+                        resultAnalysis.setPointStatus("0");
+                        resultAnalysis.setResultType("2");
+                    } else {
+                        resultAnalysis.setResStatus("0");
+                        resultAnalysis.setPointStatus("1");
+                        // 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);