Merge branch 'master' into dev/word

src/main/java/com/diagbot/entity/node/base/BaseNode.java

@@ -7,6 +7,8 @@ import org.neo4j.ogm.annotation.*;
 import org.springframework.data.repository.query.Param;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -20,7 +22,7 @@ import java.util.Set;
 public class BaseNode implements Serializable {
     @Id
     @GeneratedValue
-    private Long nodeId;
+    private Long id;
 
     @Labels
     private Set<String> labels;

src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -102,7 +102,7 @@ public class RetrievalFacade {
                 retrievalDTO.setTransfusionNames(getTransfusion(retrievalVO.getInputStr()));
                 break;
             case 9:
-                retrievalDTO.setSymptomNames(getSymptoms(retrievalVO.getInputStr()));
+                retrievalDTO.setSymptomNames(getSymptoms(retrievalVO.getInputStr(), retrievalVO.getSize()));
                 break;
         }
 
@@ -207,10 +207,10 @@ public class RetrievalFacade {
     /**
      * 获取症状列表
      */
-    public List<String> getSymptoms(String name) {
+    public List<String> getSymptoms(String name, Integer size) {
 
         SymptomNameNode symptomNameNode = new SymptomNameNode();
-        List<String> symplist = symptomNameNode.getSymptomList(name, symptomNameRepository, baseNodeRepository);
+        List<String> symplist = symptomNameNode.getSymptomList(name, size, symptomNameRepository, baseNodeRepository);
 
         return symplist;
     }

src/main/java/com/diagbot/repository/BaseNodeRepository.java

@@ -13,6 +13,10 @@ import java.util.List;
 
 public interface BaseNodeRepository extends Neo4jRepository<BaseNode, Long> {
 
+    void delete(BaseNode baseNode);
+
+    <Optional>BaseNode findById(long id);
+
     List<BaseNode> findByNameIs(String name);
 
     @Query("MATCH (n) WHERE n.name={name} RETURN n, LABELS(n) as Label")

src/main/java/com/diagbot/repository/SymptomNameNode.java

@@ -11,12 +11,16 @@ public class SymptomNameNode {
     /**
      * 获取症状名称列表
      */
-    public List<String> getSymptomList(String name, SymptomNameRepository symptomNameRepository, BaseNodeRepository baseNodeRepository) {
+    public List<String> getSymptomList(String name, Integer size, SymptomNameRepository symptomNameRepository, BaseNodeRepository baseNodeRepository) {
         List<String> symplt = new ArrayList<>();
-        List<Symptom> symplist = symptomNameRepository.index(name, name, 100);
+        if (null == size) {
+            size = 100;
+        }
+
+        List<Symptom> symplist = symptomNameRepository.index(name, name, size);
 
-        if (ListUtil.isNotEmpty(symplist) && symplist.size() > 100) {
-            symplist = symplist.subList(0, 100);
+        if (ListUtil.isNotEmpty(symplist) && symplist.size() > size) {
+            symplist = symplist.subList(0, size);
         }
 
         for (Symptom symptom : symplist) {

src/main/java/com/diagbot/vo/NeoEntityVO.java

@@ -14,6 +14,8 @@ import java.util.Map;
  */
 @Data
 public class NeoEntityVO {
+    // 节点ID
+    private Integer ID;
     // 节点名称
     private String name;
     // 节点标签

src/main/java/com/diagbot/vo/RetrievalVO.java

@@ -27,4 +27,8 @@ public class RetrievalVO {
 //     * 年龄
 //     */
 //    private Integer age;
+    /**
+     * 术语返回数量
+     */
+    private Integer size;
 }