From 1706c3c326bc88063b80cb09dc09b01e0a935c70 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Fri, 15 Nov 2024 17:59:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0=E5=9B=BE=E8=B0=B1?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B0=83=E8=AF=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/supervision/neo4j/service/Neo4jService.java    |  1 -
 .../police/service/impl/ModelIndexServiceImpl.java     | 10 +++++++---
 .../com/supervision/police/vo/GraphDebugResVO.java     |  5 +++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/supervision/neo4j/service/Neo4jService.java b/src/main/java/com/supervision/neo4j/service/Neo4jService.java
index 0612bf4..013531a 100644
--- a/src/main/java/com/supervision/neo4j/service/Neo4jService.java
+++ b/src/main/java/com/supervision/neo4j/service/Neo4jService.java
@@ -60,7 +60,6 @@ public interface Neo4jService {
     void createAbstractGraph(String path, String sheetName);
 
     void mockTestGraph(String path, String sheetName, String recordId, String recordSplitId, String caseId);
-    void mockTestGraph(String path, String sheetName, String recordId, String recordSplitId,String caseId);
 
     List<Record> executeCypher(String cypher, Map<String, Object> parameters);
 }
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 513ffa4..81f6490 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
@@ -440,6 +440,9 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
             return graphDebugResVO;
         }
 
+        if (CollUtil.isNotEmpty(records)){
+            graphDebugResVO.setRecordTitleList(records.get(0).keys());
+        }
         graphDebugResVO.setRecordList(mapRecords(records));
         graphDebugResVO.setGraphRelList(generateRelations(records));
         graphDebugResVO.setGraphNodeList(generateNodes(records));
@@ -489,7 +492,7 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
                 .filter(value -> value.type().name().equals("NODE")).map(value ->{
                             Map<String, Object> map = new HashMap<>();
                             Node node = value.asNode();
-                            map.put("id", node.id());
+                            map.put("id", String.valueOf(node.id()));
                             map.put("name", node.get("name").asString());
                             map.put("entityName", node.get("name").asString());
                             return map;
@@ -516,7 +519,7 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
             if (CollUtil.isNotEmpty(extendRecord)){
                 graphNodeList.addAll(extendRecord.stream().flatMap(r -> r.values().stream()).map(r -> {
                     Map<String, Object> map = new HashMap<>();
-                    map.put("id", r.asNode().id());
+                    map.put("id", String.valueOf(r.asNode().id()));
                     map.put("name", r.get("name").asString());
                     map.put("entityName", r.get("name").asString());
                     return map;
@@ -524,7 +527,8 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
             }
         }
 
-        return graphNodeList;
+        Set<String> nodeIdSet = new HashSet<>();
+        return graphNodeList.stream().filter(map -> nodeIdSet.add((String) map.get("id"))).toList();
     }
 
     private List<Map<String, Object>> mapRecords(List<Record> records) {
diff --git a/src/main/java/com/supervision/police/vo/GraphDebugResVO.java b/src/main/java/com/supervision/police/vo/GraphDebugResVO.java
index 24052d6..2d14fc8 100644
--- a/src/main/java/com/supervision/police/vo/GraphDebugResVO.java
+++ b/src/main/java/com/supervision/police/vo/GraphDebugResVO.java
@@ -16,6 +16,11 @@ public class GraphDebugResVO {
 
     private String message;
 
+    /**
+     * 查询结果表头
+     */
+    private List<String> recordTitleList;
+
     /**
      * 查询结果列表
      */