Merge remote-tracking branch 'origin/dev/ltkg20200312_init' into dev/ltkg20200312_init

ltkg-service/src/main/java/com/diagbot/dto/GNodeDTO.java

@@ -11,13 +11,15 @@ import lombok.Setter;
 @Getter
 @Setter
 public class GNodeDTO {
+    private String type;
     private Integer category;
     private String label;
     private Integer name;
     private String symbol;
     private Integer symbolSize;
 
-    public GNodeDTO(Integer category, String label, Integer name, String symbol, Integer symbolSize) {
+    public GNodeDTO(String type, Integer category, String label, Integer name, String symbol, Integer symbolSize) {
+        this.type = type;
         this.category = category;
         this.label = label;
         this.name = name;

ltkg-service/src/main/java/com/diagbot/facade/KgFacade.java

@@ -58,7 +58,7 @@ public class KgFacade extends KgServiceImpl {
 
             GraphDTO graphDTO = res.get(0);
             GNodeDTO gNodeDTO
-                    = new GNodeDTO(0, graphDTO.getName(), nodeId, "circle", 50);
+                    = new GNodeDTO(graphDTO.getLabel(), 0, graphDTO.getName(), nodeId, "circle", 50);
             nodeId++;
             node.add(gNodeDTO);
             if (ListUtil.isNotEmpty(graphDTO.getENodeRSDTOS())) {
@@ -70,14 +70,15 @@ public class KgFacade extends KgServiceImpl {
                         rsId++;
                     }
                     GNodeDTO nNodeDTO
-                            = new GNodeDTO(1, "", nodeId, "diamond", 10);
+                            = new GNodeDTO("", 1, "", nodeId, "diamond", 10);
                     node.add(nNodeDTO);
                     links.add(new LinkDTO(gNodeDTO.getName(), nNodeDTO.getName(), baseNodeRSDTO.getRType()));
                     nodeId++;
                     if (ListUtil.isNotEmpty(baseNodeRSDTO.getENodeDTOS())) {
                         for (BaseNodeDTO baseNodeDTO : baseNodeRSDTO.getENodeDTOS()) {
                             GNodeDTO eNodeDTO
-                                    = new GNodeDTO(cMap.get(baseNodeRSDTO.getRType()), baseNodeDTO.getName(), nodeId, random(), 28);
+                                    = new GNodeDTO(baseNodeDTO.getLabel(), cMap.get(baseNodeRSDTO.getRType()),
+                                    baseNodeDTO.getName(), nodeId, "diamond", 28);
                             nodeId++;
                             node.add(eNodeDTO);
                             links.add(new LinkDTO(nNodeDTO.getName(), eNodeDTO.getName(), ""));
@@ -93,14 +94,14 @@ public class KgFacade extends KgServiceImpl {
         return graphLabelDTO;
     }
 
-    private String random() {
-        //先随机产生一个下标再获取元素
-        String random = "";
-        String[] doc = { "circle", "diamond" };
-        int index = (int) (Math.random() * doc.length);
-        random = doc[index];
-        return random;
-    }
+//    private String random() {
+//        //先随机产生一个下标再获取元素
+//        String random = "";
+//        String[] doc = { "circle", "diamond" };
+//        int index = (int) (Math.random() * doc.length);
+//        random = doc[index];
+//        return random;
+//    }
 
     public TreeDTO getTreeFac(KgTreeVO kgTreeVO) {
         TreeDTO treeDTO = new TreeDTO();