diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java index 5093e9c..15b4983 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java @@ -662,7 +662,7 @@ public class AnalysisServiceImpl implements IAnalysisService { patrolResult = resMap.get(resItem.getObjectId()); List resultAnalysisList = new ArrayList<>(); StringJoiner valueJoiner = new StringJoiner(StringUtils.COMMA); - + StringJoiner validJoiner = new StringJoiner(StringUtils.COMMA); for (AnalyseResPoint analyseResPoint : resItem.getResults()) { ResultAnalysis resultAnalysis = combineAnalyse(analyseResult, String.valueOf(resMap.get(resItem.getObjectId()).getLineId()), @@ -671,6 +671,20 @@ public class AnalysisServiceImpl implements IAnalysisService { analyseResPoint); resultAnalysisList.add(resultAnalysis); valueJoiner.add(resultAnalysis.getResValue()); + String pointStatus = resultAnalysis.getPointStatus(); + String resultType = resultAnalysis.getResultType(); + String resStatus = resultAnalysis.getResStatus(); + // resultType:0-告警 1-正常 2-异常 + if ("0".equals(resultType)) { + // 判别异常 + validJoiner.add("2"); + } else if ("1".equals(resultType)) { + // 成功 + validJoiner.add("1"); + } else if ("2".equals(resultType)) { + // 失败 + validJoiner.add("0"); + } log.info(Color.GREEN + "[analysis] createTime: {}, insertResultAnalysis: {}" + Color.END, resultAnalysis.getCreateTime(), resultAnalysis); try { resultAnalysisService.insertResultAnalysis(resultAnalysis); @@ -680,6 +694,7 @@ public class AnalysisServiceImpl implements IAnalysisService { } patrolResult.setValue(valueJoiner.toString()); + patrolResult.setValid(validJoiner.toString()); List algAliasList = DictUtils.getDictCache(Tags.DEFECT_TYPE); JSONObject algAliasMap = new JSONObject(); Objects.requireNonNull(algAliasList).stream().filter((item) -> { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java index 467567d..70bd0cd 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java @@ -223,6 +223,8 @@ public class MessageUtils { return "patrol abnormal"; case "识别完成": return "recognition complete"; + case "读数失败 ": + return "reading failed"; default: return key; } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 79be8cb..22a9baa 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -195,11 +195,11 @@ public class PatrolResultController extends BaseController { } if ("0".equals(result.getValue())) { - result.setValue("正常"); + result.setValue(messageUtils.get("正常")); } if ("-1".equals(result.getValue()) || "1".equals(result.getValue())) { - result.setValue("异常"); + result.setValue(messageUtils.get("异常")); } }