获取所有概念(术语关系维护)修改

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -220,9 +220,11 @@ public class ConceptFacade extends ConceptServiceImpl {
             QueryWrapper<Relation> relationQe = new QueryWrapper<>();
             relationQe.eq("relation_id", getAllForRelationVO.getRelationId());
             if (getAllForRelationVO.getRelationPosition() == 1) {
-            	relationQe.eq(getAllForRelationVO.getRelationConceptId() != null, "end_id", getAllForRelationVO.getRelationConceptId());
-            	relationQe.and(wrapper->wrapper.in("start_id", conceptIdList).or(getAllForRelationVO.getRelationConceptId() == null).in("end_id", conceptIdList));
-                reCouMap = relationFacade.list(relationQe).stream().collect(Collectors.groupingBy(Relation::getStartId, Collectors.counting()));
+            	if(getAllForRelationVO.getIsStartRootExt()==1){
+            		relationQe.eq(getAllForRelationVO.getRelationConceptId() != null, "end_id", getAllForRelationVO.getRelationConceptId());
+                	relationQe.and(wrapper->wrapper.in("start_id", conceptIdList).or(getAllForRelationVO.getRelationConceptId() == null).in("end_id", conceptIdList));
+                    reCouMap = relationFacade.list(relationQe).stream().collect(Collectors.groupingBy(Relation::getStartId, Collectors.counting()));
+            	}
             } else if(getAllForRelationVO.getRelationConceptId() != null) {
                 relationQe.in("end_id", conceptIdList);
                 relationQe.eq("start_id", getAllForRelationVO.getRelationConceptId());

knowledgeman-service/src/main/java/com/diagbot/vo/GetAllForRelationVO.java

@@ -27,6 +27,12 @@ public class GetAllForRelationVO {
     @ApiModelProperty(value="词性id")
     private Long typeId;
     
+    /**
+     * 根节点时，是否排除已经建立过关系的术语：0-不排除、1-排除
+     */
+    @ApiModelProperty(value="根节点时，是否排除已经建立过关系的术语：0-不排除、1-排除")
+    private Integer isStartRootExt = 0;
+    
     /**
      * 搜索出来的概念在关系中的位置，1-起点术语，2-终点术语，3-不考虑关系
      */