diff --git a/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java index d74c270..2e77ebd 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java @@ -463,6 +463,9 @@ public class ModelIndexServiceImpl extends ServiceImpl, List>> pair = this.neo4jService.mergeRecord(generateNodes(records), generateRelations(records)); graphDebugResVO.setGraphRelList(pair.getKey()); + // 移除没有关系的图节点 + pair.getValue().removeIf(node -> pair.getKey().stream().noneMatch( + rel -> StrUtil.equals(rel.getSource(), node.get("id")) || StrUtil.equals(rel.getTarget(), node.get("id")))); graphDebugResVO.setGraphNodeList(pair.getValue()); List> collect = graphDebugResVO.getGraphRelList().stream().collect(Collectors.groupingBy(WebRelDTO::getName, Collectors.counting())) diff --git a/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java b/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java index a80b4e9..b7af5ad 100644 --- a/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java @@ -58,18 +58,26 @@ public class MroServiceImpl implements MroService { log.info("开始异步分析案件...."); List caseIdList = new ArrayList<>(); for (ModelCase modelCase : modelCases) { - int caseAnalysisStatus = modelCase.getCaseAnalysisStatus(); - if (1 == caseAnalysisStatus) { - log.info("案件【{}】正在分析中,跳过", modelCase.getCaseName()); - continue; + try { + int caseAnalysisStatus = modelCase.getCaseAnalysisStatus(); + if (1 == caseAnalysisStatus) { + log.info("案件【{}】正在分析中,跳过", modelCase.getCaseName()); + continue; + } + caseStatusManageService.whenAnalyseCaseStart(modelCase.getId()); + caseIdList.add(modelCase.getId()); + } catch (Exception e) { + log.error("案件【{}】添加开始标识失败!", modelCase.getCaseName(), e); } - caseStatusManageService.whenAnalyseCaseStart(modelCase.getId()); - caseIdList.add(modelCase.getId()); } for (String caseId : caseIdList) { - AnalyseCaseDTO analyseCaseDTO = new AnalyseCaseDTO(); - analyseCaseDTO.setCaseId(caseId); - modelService.analyseCaseWrapper(analyseCaseDTO); + try { + AnalyseCaseDTO analyseCaseDTO = new AnalyseCaseDTO(); + analyseCaseDTO.setCaseId(caseId); + modelService.analyseCaseWrapper(analyseCaseDTO); + } catch (Exception e) { + log.error("案件【{}】分析失败", caseId, e); + } } log.info("案件分析完成!"); }).start();