术语导入修改

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

@@ -808,9 +808,17 @@ public class ConceptFacade extends ConceptServiceImpl {
         
         Map<String,Lexicon> lexiconMap = lexiconFacade.list().stream().collect(Collectors.toMap(Lexicon::getName, i->i));
         
-        addConceptInfoVOList.forEach(i -> {
-        	i = checkImConceptInfo(i,libraryInfoListMap,lexiconMap);
-        });
+        String ckmsg = null;
+        for(AddConceptInfoVO addConceptInfoVO : addConceptInfoVOList){
+        	ckmsg = checkImConceptInfo(addConceptInfoVO,libraryInfoListMap,lexiconMap);
+        	if(StringUtil.isNotBlank(ckmsg)){
+        		sbf.append("第").append(addConceptInfoVO.getLineNum()).append("行").append(ckmsg).append("<br/>");
+        	}
+        }
+        
+        if (sbf.length() > 0) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, sbf.toString());
+        }
         
         saveAddConceptInfoVOList(addConceptInfoVOList);
 
@@ -824,27 +832,25 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @param lexiconMap
      * @return
      */
-    public AddConceptInfoVO checkImConceptInfo(AddConceptInfoVO addConceptInfoVO,Map<String,List<LibraryInfo>> libraryInfoListAllMap,Map<String,Lexicon> lexiconMap) {
+    public String checkImConceptInfo(AddConceptInfoVO addConceptInfoVO,Map<String,List<LibraryInfo>> libraryInfoListAllMap,Map<String,Lexicon> lexiconMap) {
     	String currentUser = UserUtils.getCurrentPrincipleID();
         Date now = DateUtil.now();
     	
     	Concept concept = new Concept();
     	ConceptCommon conceptCommon = null;
     	List<LibraryInfo> libraryInfoList = Lists.newArrayList();
-    	
-        String lineNumStr = "第" + addConceptInfoVO.getLineNum() + "行";
 
         List<AddConceptInfoDetailVO> addConceptInfoDetailVOMainList = addConceptInfoVO.getDetailList().stream().filter(i -> i.getIsConcept() == 1).collect(Collectors.toList());
         if (addConceptInfoDetailVOMainList.size() == 0) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, lineNumStr + "同义词中缺少标准词本体！");
+        	return "同义词中缺少标准词本体！";
         }
         if (addConceptInfoDetailVOMainList.size() > 1) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, lineNumStr + "标准术语只能有一个！");
+        	return "标准术语只能有一个！";
         }
         
         Lexicon lexicon = lexiconMap.get(addConceptInfoVO.getType());
         if (lexicon == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, lineNumStr + "数据有误，该类型信息在数据库中不存在！");
+        	return "数据有误，该类型信息在数据库中不存在！";
         }
         Long typeId = lexicon.getId();
         concept.setLibType(typeId);
@@ -887,7 +893,7 @@ public class ConceptFacade extends ConceptServiceImpl {
             addConceptInfoVO.setConceptId(conceptId);
 
             if (libraryInfoMain.getIsConcept()!=1&&extLibraryInfoList.stream().filter(i -> i.getConceptId().intValue() == libraryInfoMain.getConceptId().intValue()).count() == 1) {
-            	throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "标准术语已作为同义词被占用！");
+            	return "标准术语已作为同义词被占用！";
             }
         }
 
@@ -918,14 +924,14 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         if (sbf.length() > 0) {
             sbf.append("已被占用");
-            throw new CommonException(CommonErrorCode.RPC_ERROR, sbf.toString());
+            return sbf.toString();
         }
         
         addConceptInfoVO.setConcept(concept);
         addConceptInfoVO.setConceptCommon(conceptCommon);
         addConceptInfoVO.setLibraryInfoList(libraryInfoList);
 
-        return addConceptInfoVO;
+        return null;
     }
     
     /**