gaodm 5 лет назад
Родитель
Сommit
ddc9651617

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

@@ -3,8 +3,6 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-
 /**
  * @Description:
  * @author: gaodm
@@ -14,6 +12,5 @@ import java.util.List;
 @Setter
 public class BaseNodeDTO {
     private String name;
-    private List<String> labels;
-
+    private String label;
 }

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

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/3/16 11:02
+ */
+@Getter
+@Setter
+public class BaseNodeRDTO {
+    private String rType;
+    private List<BaseNodeDTO> eNodeDTOS;
+}

+ 1 - 2
ltkg-service/src/main/java/com/diagbot/dto/GraphDTO.java

@@ -13,6 +13,5 @@ import java.util.List;
 @Getter
 @Setter
 public class GraphDTO extends BaseNodeDTO{
-    private String rType;
-    private List<BaseNodeDTO> eNodeDTOS;
+    private List<BaseNodeRDTO> eNodeRDTOS;
 }

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

@@ -4,10 +4,14 @@
 <mapper namespace="com.diagbot.mapper.KgMapper">
 
     <resultMap id="GraphResultMap" type="com.diagbot.dto.GraphDTO">
-        <id column="sName" property="name"/>
-        <result column="rType" property="rType"/>
-        <collection property="eNodeDTOS" ofType="com.diagbot.dto.BaseNodeDTO">
-            <result column="eName" property="name"/>
+        <result column="sName" property="name"/>
+        <result column="sLabel" property="label"/>
+        <collection property="eNodeRDTOS" ofType="com.diagbot.dto.BaseNodeRDTO">
+            <result column="rType" property="rType"/>
+            <collection property="eNodeDTOS" ofType="com.diagbot.dto.BaseNodeDTO">
+                <result column="eName" property="name"/>
+                <result column="eLabel" property="label"/>
+            </collection>
         </collection>
     </resultMap>