Merge branch 'dev-neo4j-debug' into dev

src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java

@@ -463,6 +463,9 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
         // 尝试转换为图形数据
         Pair<List<WebRelDTO>, List<Map<String, String>>> 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<Map<String, Object>> collect = graphDebugResVO.getGraphRelList().stream().collect(Collectors.groupingBy(WebRelDTO::getName, Collectors.counting()))

src/main/java/com/supervision/police/service/impl/MroServiceImpl.java

@@ -58,18 +58,26 @@ public class MroServiceImpl implements MroService {
             log.info("开始异步分析案件....");
             List<String> 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();