Browse Source

获取描述框架结构修改

wangfeng 5 years ago
parent
commit
968b78f42d

+ 1 - 4
ltkg-service/src/main/java/com/diagbot/dto/NodeLabelsDTO.java

@@ -11,9 +11,6 @@ import lombok.Setter;
 @Setter
 @Setter
 @Getter
 @Getter
 public class NodeLabelsDTO {
 public class NodeLabelsDTO {
-
-    private int Id;
-    private String relationNode;
-    private String node;
+    private String name;
 
 
 }
 }

+ 18 - 0
ltkg-service/src/main/java/com/diagbot/dto/RelationNodesDTO.java

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-18 17:01
+ */
+@Setter
+@Getter
+public class RelationNodesDTO {
+    private String name;
+    private List<NodeLabelsDTO> children;
+}

+ 3 - 3
ltkg-service/src/main/java/com/diagbot/dto/SchemaDTO.java

@@ -13,7 +13,7 @@ import java.util.List;
 @Setter
 @Setter
 @Getter
 @Getter
 public class SchemaDTO {
 public class SchemaDTO {
-    private int nodeId;
-    private String diseaseNode;
-    private List<NodeLabelsDTO> nodeLabels;
+    private String name;
+    private List<RelationNodesDTO> children;
+
 }
 }

+ 6 - 8
ltkg-service/src/main/resources/mapper/KgMapper.xml

@@ -15,13 +15,13 @@
         </collection>
         </collection>
     </resultMap>
     </resultMap>
     <resultMap id="SchemaResultMap" type="com.diagbot.dto.SchemaDTO">
     <resultMap id="SchemaResultMap" type="com.diagbot.dto.SchemaDTO">
-        <result column="nodeId" property="nodeId"/>
-        <result column="diseaseNode" property="diseaseNode"/>
-            <collection property="nodeLabels" ofType="com.diagbot.dto.NodeLabelsDTO">
-                <result column="relationNode" property="relationNode"/>
-                <result column="Id" property="Id"/>
-                <result column="node" property="node"/>
+        <result column="diseaseNode" property="name"/>
+        <collection property="children" ofType="com.diagbot.dto.RelationNodesDTO">
+            <result column="relationNode" property="name"/>
+            <collection property="children" ofType="com.diagbot.dto.NodeLabelsDTO">
+                <result column="node" property="name"/>
             </collection>
             </collection>
+        </collection>
     </resultMap>
     </resultMap>
 
 
     <select id="getNode" parameterType='com.diagbot.vo.KgQueryVO' resultType="com.diagbot.dto.NodeDTO">
     <select id="getNode" parameterType='com.diagbot.vo.KgQueryVO' resultType="com.diagbot.dto.NodeDTO">
@@ -49,10 +49,8 @@
       match(d:${labelName})-[r]->(h)
       match(d:${labelName})-[r]->(h)
       where d.name = #{pramNme}
       where d.name = #{pramNme}
       return
       return
-       id(d) as nodeId ,
        d.name as diseaseNode ,
        d.name as diseaseNode ,
       type(r) as relationNode ,
       type(r) as relationNode ,
-      id(h) as Id ,
       h.name as node
       h.name as node
     </select>
     </select>