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 753fab7..073c26a 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 @@ -9,6 +9,7 @@ import com.inspect.analysis.domain.AnalyseResPoint; import com.inspect.analysis.domain.ResultAnalysis; import com.inspect.base.core.constant.AlgConstants; import com.inspect.base.core.enums.PointStatusEnum; +import com.inspect.base.core.enums.ResStatusEnum; import com.inspect.base.core.enums.ResultTypeEnum; import com.inspect.base.core.utils.BigDecimalUtil; import com.inspect.base.core.utils.StringUtils; @@ -49,7 +50,7 @@ public class ResultAnalysisUtils { || AnalyseConstants.ANALYSE_FAIL_FILE_INCOMPATIBLE.equals(code)) { resultAnalysis.setDescription(desc); } else if (AnalyseConstants.ANALYSE_FAIL_ALG_EXCEPT.equals(code)) { - resultAnalysis.setDescription(messageUtils.get("算法内部异常")); + resultAnalysis.setDescription(messageUtils.get("分析失败")); } else { resultAnalysis.setDescription(messageUtils.get("未知错误")); log.error("[ANALYSE RES] Error Return Code={}", code); @@ -135,9 +136,24 @@ public class ResultAnalysisUtils { resultAnalysis.setPointStatus("1"); resultAnalysis.setResultType("1"); } else if (algType.equals("switch")) { - resultAnalysis.setResStatus("1"); - resultAnalysis.setPointStatus("1"); - resultAnalysis.setResultType("1"); + String[] values = value.split(StringUtils.COMMA); + // value值:空|null|1|未识别-异常,灭-缺陷,亮|开|合|投入|其他-正常 + boolean isDefect = Arrays.stream(values).anyMatch(v -> "灭".equals(v)); + boolean isAbnormal = Arrays.stream(values).anyMatch(v -> "".equals(v) || "null".equals(v) || "1".equals(v) || "未识别".equals(v)); + + if (isDefect) { + resultAnalysis.setPointStatus(PointStatusEnum.DEFECT.getCode()); + resultAnalysis.setResultType(ResultTypeEnum.DEFECT.getCode()); + resultAnalysis.setResStatus(ResStatusEnum.UNCONFIRM.getCode()); + } else if (isAbnormal) { + resultAnalysis.setPointStatus(PointStatusEnum.ABNORMAL.getCode()); + resultAnalysis.setResultType(ResultTypeEnum.ABNORMAL.getCode()); + resultAnalysis.setResStatus(ResStatusEnum.UNCONFIRM.getCode()); + } else { + resultAnalysis.setPointStatus(PointStatusEnum.NORMAL.getCode()); + resultAnalysis.setResultType(ResultTypeEnum.NORMAL.getCode()); + resultAnalysis.setResStatus(ResStatusEnum.CONFIRM.getCode()); + } } else if (algType.equals("light")) { resultAnalysis.setResStatus("1"); resultAnalysis.setPointStatus("1");