获取树形分类接口

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

@@ -11,13 +11,11 @@ import com.diagbot.dto.GraphLabelDTO;
 import com.diagbot.dto.Link;
 import com.diagbot.dto.LinkDTO;
 import com.diagbot.dto.Node;
-import com.diagbot.dto.TreeDTO;
 import com.diagbot.dto.Tu;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.KgServiceImpl;
 import com.diagbot.util.EntityUtil;
-import com.diagbot.util.FastJsonUtils;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.KgQueryVO;
 import com.diagbot.vo.KgTreeVO;
@@ -99,57 +97,18 @@ public class KgFacade extends KgServiceImpl {
         return random;
     }
 
-    public TreeDTO getTreeFac(KgTreeVO kgTreeVO) {
-        TreeDTO treeDTO = new TreeDTO();
-        if (kgTreeVO.getType() == 1 && kgTreeVO.getSubType() == 1) {
-            treeDTO = FastJsonUtils.getJsonToBean(jsonStr, TreeDTO.class);
+    public String getTreeFac(KgTreeVO kgTreeVO) {
+        String tree = "";
+        if (kgTreeVO.getType() == 1
+                && kgTreeVO.getSubType() == 1) {
+            KgQueryVO kgQueryVO = new KgQueryVO();
+            kgQueryVO.setLabelName("国icd10");
+            kgQueryVO.setInputStr("国icd10");
+            tree = this.getTree(kgQueryVO);
         } else {
             throw new CommonException(CommonErrorCode.PARAM_IS_ERROR);
         }
-        return treeDTO;
-    }
-
-    private static final String jsonStr = "{\n" +
-            "    \"icdCode\": \"1\",\n" +
-            "    \"label\": null,\n" +
-            "    \"name\": \"疾病\",\n" +
-            "    \"snode\": [\n" +
-            "      {\n" +
-            "\t\t\"icdCode\": \"A\",\n" +
-            "\t\t\"label\": \"\",\n" +
-            "\t\t\"name\": \"A\",\n" +
-            "\t\t\"snode\": [\n" +
-            "\t\t  {\n" +
-            "\t\t\t\"icdCode\": \"A1\",\n" +
-            "\t\t\t\"label\": \"\",\n" +
-            "\t\t\t\"name\": \"A1\",\n" +
-            "\t\t\t\"snode\": [\n" +
-            "\t\t\t  null\n" +
-            "\t\t\t]\n" +
-            "\t\t  },\n" +
-            "\t\t  {\n" +
-            "\t\t\t\"icdCode\": \"A2\",\n" +
-            "\t\t\t\"label\": \"\",\n" +
-            "\t\t\t\"name\": \"A2\",\n" +
-            "\t\t\t\"snode\": [\n" +
-            "\t\t\t  null\n" +
-            "\t\t\t]\n" +
-            "\t\t  }\n" +
-            "\t\t]\n" +
-            "\t  },\n" +
-            "\t  {\n" +
-            "\t\t\"icdCode\": \"B\",\n" +
-            "\t\t\"label\": \"\",\n" +
-            "\t\t\"name\": \"B\",\n" +
-            "\t\t\"snode\": [\n" +
-            "\t\t  null\n" +
-            "\t\t]\n" +
-            "\t  }\n" +
-            "    ]\n" +
-            "}";
-
-    private void addNode(TreeDTO treeDTO) {
-
+        return tree;
     }
 
     public GraDTO getTuFac(KgQueryVO kgQueryVO) {

ltkg-service/src/main/java/com/diagbot/mapper/KgMapper.java

@@ -27,7 +27,7 @@ public interface KgMapper {
 
     List<GraphDTO> getGraph(KgQueryVO kgQueryVO);
 
-    List<Map> getTree();
+    String getTree(KgQueryVO kgQueryVO);
 
     List<SchemaDTO> getSchema(SchemaVO schemaVO);
 

ltkg-service/src/main/java/com/diagbot/service/KgService.java

@@ -25,7 +25,7 @@ public interface KgService {
 
     List<GraphDTO> getGraph(KgQueryVO kgQueryVO);
 
-    List<Map> getTree();
+    String getTree(KgQueryVO kgQueryVO);
 
     List<SchemaDTO> getSchema(SchemaVO schemaVO);
 

ltkg-service/src/main/java/com/diagbot/service/impl/KgServiceImpl.java

@@ -46,8 +46,8 @@ public class KgServiceImpl implements KgService {
     }
 
     @Override
-    public List<Map> getTree(){
-        return kgMapper.getTree();
+    public String getTree(KgQueryVO kgQueryVO){
+        return kgMapper.getTree(kgQueryVO);
     }
 
     @Override

ltkg-service/src/main/java/com/diagbot/web/KgController.java

@@ -40,7 +40,7 @@ public class KgController {
     @ApiOperation(value = "查询节点", notes = "查询节点")
     @PostMapping("/getNode")
     @SysLogger("getNode")
-    public RespDTO<List<NodeDTO>> getNode(@RequestBody KgQueryVO kgQueryVO) {
+    public RespDTO<List<NodeDTO>> getNode(@RequestBody @Valid KgQueryVO kgQueryVO) {
         return RespDTO.onSuc(kgFacade.getNode(kgQueryVO));
     }
 
@@ -54,18 +54,17 @@ public class KgController {
     @ApiOperation(value = "获取树形分类", notes = "获取树形分类")
     @PostMapping("/getTree")
     @SysLogger("getTree")
-    public RespDTO<TreeDTO> getTree(@RequestBody @Valid KgTreeVO kgTreeVO) {
+    public RespDTO<String> getTree(@RequestBody @Valid KgTreeVO kgTreeVO) {
         return RespDTO.onSuc(kgFacade.getTreeFac(kgTreeVO));
     }
 
     @ApiOperation(value = "获取描述框架", notes = "获取描述框架")
     @PostMapping("/getSchema")
     @SysLogger("getSchema")
-    public RespDTO<List<SchemaDTO>> getSchema(@RequestBody SchemaVO schemaVO) {
+    public RespDTO<List<SchemaDTO>> getSchema(@RequestBody @Valid SchemaVO schemaVO) {
         return RespDTO.onSuc(kgFacade.getSchema(schemaVO));
     }
 
-
     @ApiOperation(value = "获取图", notes = "获取图")
     @PostMapping("/getTu")
     @SysLogger("getTu")

ltkg-service/src/main/resources/mapper/KgMapper.xml

@@ -41,8 +41,8 @@
         LIMIT 100
     </select>
 
-    <select id="getTree" resultType="java.util.Map">
-      MATCH (obj:`疾病名称`) RETURN obj LIMIT 25
+    <select id="getTree" resultType="java.lang.String">
+      Match (n:${labelName}) where n.name = #{inputStr} return n.describe
     </select>
 
     <select id="getSchema" parameterType='com.diagbot.vo.SchemaVO' resultMap="SchemaResultMap">