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 0798a1a..6b810d4 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 @@ -23,6 +23,8 @@ public class ResultAnalysisUtils { public boolean checkCode(String code, String desc, ResultAnalysis resultAnalysis) { if (AnalyseConstants.ANALYSE_OK.equals(code)) { resultAnalysis.setCreateTime(new Date()); + resultAnalysis.setPointStatus("1"); + resultAnalysis.setResStatus("0"); return true; } 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 d8ed067..2229c85 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 @@ -1606,7 +1606,7 @@ public class PatrolResultController extends BaseController { if (!resultList.isEmpty()) { logger.info(Color.CYAN + "+++++++ callAlgorithm start +++++++" + Color.END); - if (jsonRootBean.getTotalNumber() == null) { + if (jsonRootBean.getTotalNumber() == null && !tasks.isEmpty()) { logger.info("jsonRootBean.getTotalNumber() == null"); String taskId = String.valueOf(tasks.get(0).getTaskId()); logger.info("taskId: {}", taskId); @@ -1620,7 +1620,11 @@ public class PatrolResultController extends BaseController { logger.info("algCount: {}", algCount); jsonRootBean.setTotalNumber(algCount); } - callRemoteAlgorithm(jsonRootBean.getTotalNumber(), resultList); + if(!tasks.isEmpty()) { + callRemoteAlgorithm(jsonRootBean.getTotalNumber(), resultList); + } else { + logger.info(Color.CYAN + "callAlgorithm task: {} not exist!!!" + Color.END, code); + } logger.info(Color.CYAN + "+++++++ callAlgorithm end +++++++" + Color.END); } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 9131b72..528ef42 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -2973,18 +2973,24 @@ public class PatrolTaskController extends BaseController { Map map1 = new HashMap<>(); if (!listPointStatus.contains(item.getPointStatus())) { - if (item.getPointStatus().equals("1")) { - map1.put("value", "1"); - map1.put("label", MessageUtils.get("正常")); - } + if (StringUtils.isNotEmpty(item.getPointStatus())) { + if (item.getPointStatus().equals("1")) { + map1.put("value", "1"); + map1.put("label", MessageUtils.get("正常")); + } - if (item.getPointStatus().equals("0")) { - map1.put("value", "0"); - map1.put("label", MessageUtils.get("异常")); - } + if (item.getPointStatus().equals("0")) { + map1.put("value", "0"); + map1.put("label", MessageUtils.get("异常")); + } - listPointStatus.add(item.getPointStatus()); - mapList.add(map1); + listPointStatus.add(item.getPointStatus()); + mapList.add(map1); + } else { + logger.info("GET_PATROL_POINT_NAME taskPatrolId: {} result_analysis point_status is null, item: {}", + patro.getTaskPatrolledId(), + item); + } } if (!listDeviceSource.contains(item.getDeviceSource())) {