From dcedd984dc8cdad15f9f36ba21f4d45d7fbcc0b9 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Mon, 13 Jan 2025 10:29:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=20=E6=A1=88=E4=BB=B6=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E5=88=86=E6=9E=90=20=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8D=95=E8=8E=B7=EF=BC=8C=E9=98=B2=E6=AD=A2=E6=A1=88=E4=BB=B6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=80=E7=9B=B4=E5=81=9C=E7=95=99=E5=9C=A8?= =?UTF-8?q?=E6=AD=A3=E5=9C=A8=E5=88=86=E6=9E=90=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/service/impl/MroServiceImpl.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) 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(); From 8f03ed6b6fbede707b1f27ebbf231db6b099a443 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Mon, 13 Jan 2025 10:56:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=20=E5=9B=BE=E7=89=87=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=B2=A1=E6=9C=89=E5=85=B3=E7=B3=BB=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/police/service/impl/ModelIndexServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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()))