浏览代码

第三层的概念id不能为空!

wangfeng 4 年之前
父节点
当前提交
0c474cb56a
共有 1 个文件被更改,包括 15 次插入10 次删除
  1. 15 10
      cdssman-service/src/main/java/com/diagbot/facade/RelationContactFacade.java

+ 15 - 10
cdssman-service/src/main/java/com/diagbot/facade/RelationContactFacade.java

@@ -4,19 +4,24 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.*;
+import com.diagbot.dto.GetAllForRelationDTO;
+import com.diagbot.dto.RelationNameDTO;
 import com.diagbot.entity.KlConcept;
 import com.diagbot.entity.KlRelation;
 import com.diagbot.entity.KlRelationOrder;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.LexiconEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.KlRelationService;
 import com.diagbot.service.impl.KlRelationOrderServiceImpl;
 import com.diagbot.service.impl.KlRelationServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
-import com.diagbot.vo.*;
+import com.diagbot.vo.DisNameFindVO;
+import com.diagbot.vo.DiseaseDeleteVO;
+import com.diagbot.vo.GetAllForRelationVO;
+import com.diagbot.vo.KlRelationSaveVO;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections4.MapUtils;
@@ -25,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.Date;
@@ -131,6 +135,7 @@ public class RelationContactFacade extends KlRelationServiceImpl {
     @DS("med")
     @DSTransactional
     public Boolean saveRelation(List<KlRelationSaveVO> klRelationSaveVOs) {
+        boolean res= false;
         if (ListUtil.isNotEmpty(klRelationSaveVOs)) {
             List<List<KlRelation>> relationGroupList = Lists.newArrayList();
             KlRelationSaveVO klRelationSaveVO = klRelationSaveVOs.get(0);
@@ -143,7 +148,7 @@ public class RelationContactFacade extends KlRelationServiceImpl {
                 this.removeByIds(ids);
                 QueryWrapper<KlRelationOrder> relationOrderQe = new QueryWrapper<>();
                 relationOrderQe.in("t_relation_id", ids);
-                klRelationOrderFacade.remove(relationOrderQe);
+                res = klRelationOrderFacade.remove(relationOrderQe);
             }
             for (KlRelationSaveVO kls : klRelationSaveVOs) {
                 @NotNull(message = "概念开始id必传") Long sid1 = kls.getSid();
@@ -159,6 +164,8 @@ public class RelationContactFacade extends KlRelationServiceImpl {
                         return klRelation;
                     }).collect(Collectors.toList());
                     relationGroupList.add(collect);
+                }else {
+                    throw new CommonException(CommonErrorCode.FAIL, "第三层的概念id不能为空!");
                 }
             }
             Date now = DateUtil.now();
@@ -171,7 +178,7 @@ public class RelationContactFacade extends KlRelationServiceImpl {
                     relationLists.add(j);
                 });
             });
-            klRelationService.saveBatch(relationLists);
+            res = klRelationService.saveBatch(relationLists);
 
             List<KlRelationOrder> relationOrderList = Lists.newArrayList();
             relationGroupList.forEach(i -> {
@@ -187,11 +194,9 @@ public class RelationContactFacade extends KlRelationServiceImpl {
                     relationOrderList.add(relationOrder);
                 }
             });
-            klRelationOrderServiceImpl.saveBatch(relationOrderList);
-
-
+           res = klRelationOrderServiceImpl.saveBatch(relationOrderList);
         }
-        return true;
+        return res;
     }
 
     private List<List<KlRelation>> relationDataForAdd(List<KlRelationSaveVO> klRelationSaveVOs) {