From 3dce7143311e5d02bf6b4062601ba153e78de52c Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Mon, 11 Mar 2024 09:21:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9F=A5=E8=AF=86=E5=9B=BE?=
 =?UTF-8?q?=E8=B0=B1=E7=9A=84=E7=9F=A5=E8=AF=86=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GraphNebulaServiceImpl.java  | 28 +------------------
 .../java/com/supervision/vo/TreeNodeVO.java   |  4 +--
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/virtual-patient-graph/src/main/java/com/supervision/service/impl/GraphNebulaServiceImpl.java b/virtual-patient-graph/src/main/java/com/supervision/service/impl/GraphNebulaServiceImpl.java
index 4e8c2c94..cb083f44 100644
--- a/virtual-patient-graph/src/main/java/com/supervision/service/impl/GraphNebulaServiceImpl.java
+++ b/virtual-patient-graph/src/main/java/com/supervision/service/impl/GraphNebulaServiceImpl.java
@@ -3,12 +3,9 @@ package com.supervision.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.supervision.dao.*;
 import com.supervision.domain.*;
 import com.supervision.enums.TagEnum;
@@ -362,30 +359,7 @@ public class GraphNebulaServiceImpl implements GraphNebulaService {
         for (TreeNodeVO nodeVO : firstNodeList) {
             recursionBuildTree(nodeVO, treeNodeMap, graphVO.getEdges());
         }
-        // 为所有节点分配新的唯一ID(前端需要ID字段为唯一ID)
-        Snowflake snowflake = IdUtil.getSnowflake(1);
-        // 先转JSON,再转回去.为了避免出现对象复用的情况,导致ID不能分配为唯一ID
-        String jsonStr = JSONUtil.toJsonStr(firstNodeList);
-        List<TreeNodeVO> newTreeNodeList = JSONUtil.toList(jsonStr, TreeNodeVO.class);
-
-        recursionGenerateSingleId(newTreeNodeList, snowflake);
-        return newTreeNodeList;
-    }
-
-    /**
-     * 为属性结构构建新的唯一ID,把原先的ID迁移到GraphId
-     */
-    private void recursionGenerateSingleId(List<TreeNodeVO> firstNodeList, Snowflake snowflake) {
-        for (TreeNodeVO treeNodeVO : firstNodeList) {
-            if (StrUtil.isBlank(treeNodeVO.getGraphId())) {
-                treeNodeVO.setGraphId(treeNodeVO.getId());
-            }
-            String nextId = snowflake.nextIdStr() + "-id";
-            treeNodeVO.setId(nextId);
-            if (CollUtil.isNotEmpty(treeNodeVO.getChildren())) {
-                recursionGenerateSingleId(treeNodeVO.getChildren(), snowflake);
-            }
-        }
+        return firstNodeList;
     }
 
     private void recursionBuildTree(TreeNodeVO preNode, Map<String, TreeNodeVO> treeNodeMap, List<EdgeVO> edgeList) {
diff --git a/virtual-patient-graph/src/main/java/com/supervision/vo/TreeNodeVO.java b/virtual-patient-graph/src/main/java/com/supervision/vo/TreeNodeVO.java
index 9150cc3d..1910e798 100644
--- a/virtual-patient-graph/src/main/java/com/supervision/vo/TreeNodeVO.java
+++ b/virtual-patient-graph/src/main/java/com/supervision/vo/TreeNodeVO.java
@@ -12,10 +12,8 @@ import java.util.Map;
 @ApiModel
 public class TreeNodeVO {
 
-    @ApiModelProperty("重新分配的唯一ID")
-    private String id;
     @ApiModelProperty("图谱ID")
-    private String graphId;
+    private String id;
 
     @ApiModelProperty("节点值")
     private String nodeValue;