From ab9ae0c2d08d0af2958d8ecab866bdb6c29e0ab5 Mon Sep 17 00:00:00 2001
From: "1654135867@qq.com" <q1w2e3a4s5d6>
Date: Fri, 28 Apr 2023 10:02:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E8=B0=B1=E7=BD=91=E7=8A=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/seknowgroup/atlas/js/main1.js     |  2 --
 .../controller/SeKnowGroupController.java       | 17 +++++------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/seknowgroup/atlas/js/main1.js b/ant-design-vue-jeecg/src/views/seknowgroup/atlas/js/main1.js
index b575ef5..2fcdff1 100644
--- a/ant-design-vue-jeecg/src/views/seknowgroup/atlas/js/main1.js
+++ b/ant-design-vue-jeecg/src/views/seknowgroup/atlas/js/main1.js
@@ -1,5 +1,3 @@
-import {getAction} from "../../../../api/manage";
-
 export let threeMainFunction = function(e) {
   function t(t) {
     for (var a, u, s = t[0], i = t[1], c = t[2], d = 0, p = []; d < s.length; d++) u = s[d], r[u] && p.push(r[u][0]), r[u] = 0;
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/seknowgroup/controller/SeKnowGroupController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/seknowgroup/controller/SeKnowGroupController.java
index e126ebc..6b67e1f 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/seknowgroup/controller/SeKnowGroupController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/seknowgroup/controller/SeKnowGroupController.java
@@ -203,14 +203,13 @@ public class SeKnowGroupController extends JeecgController<SeKnowGroup, ISeKnowG
             NodeName nodes1 = new NodeName();
             //根据id获取知识点名字，并且进行赋值
             nodes1.setName(seKonwService.getById(listid.get(i)).getName());
-
             nodelist.add(nodes1);
             //开始第二层循环
             List<String> listid2 = seKnowGroupService.listid(listid.get(i));
             for (int j =0;j<listid2.size();j++ ){
                 NodeName nodes2 = new NodeName();
                 nodes2.setName(seKonwService.getById(listid.get(j)).getName());
-                nodelist.add(nodes2);
+                System.out.println(seKonwService.getById(listid.get(j)).getName());
             }
         }
         //现在开始组装知识图谱经管系节点
@@ -218,6 +217,7 @@ public class SeKnowGroupController extends JeecgController<SeKnowGroup, ISeKnowG
         //首先根据中心知识点查询
         List<SeKonwRelationshipMain> segouplisttemp = new ArrayList<>();
         segouplisttemp=seKnowGroupService.getzxzsnodelist(seknow.getId());
+        //第二层
         for (int i=0; i< segouplisttemp.size();i++){
             NodeList ndoesl = new NodeList();
             ndoesl.setSource(seKonwService.getById(segouplisttemp.get(i).getPerKowId()).getName());
@@ -228,22 +228,15 @@ public class SeKnowGroupController extends JeecgController<SeKnowGroup, ISeKnowG
             segouplisttemp2=seKnowGroupService.getzxzsnodelist(segouplisttemp.get(i).getNextKnowId());
             for (int j=0;j<segouplisttemp2.size();j++){
                 NodeList ndoesl2 = new NodeList();
-                ndoesl2.setSource(seKonwService.getById(segouplisttemp.get(i).getPerKowId()).getName());
-                ndoesl2.setTarget(seKonwService.getById(segouplisttemp.get(i).getNextKnowId()).getName());
-                ndoesl2.setValue(seKonwService.getrelaint(segouplisttemp.get(i).getRelationId()));
+                ndoesl2.setSource(seKonwService.getById(segouplisttemp2.get(j).getPerKowId()).getName());
+                ndoesl2.setTarget(seKonwService.getById(segouplisttemp2.get(j).getNextKnowId()).getName());
+                ndoesl2.setValue(seKonwService.getrelaint(segouplisttemp2.get(j).getRelationId()));
                 nodelistdss.add(ndoesl2);
             }
         }
         Exports exep = new Exports();
         exep.setNodes(nodelist.stream().distinct().collect(Collectors.toList()));
         exep.setLinks(nodelistdss);
-
-        System.out.println(exep);
-
-
-
-
-
         return exep;
     }