修改标签元数据导入接口

src/main/java/com/keymobile/tagmanager/service/TagFileService.java

@@ -61,8 +61,8 @@ public class TagFileService {
 		importLog.setCreator(userName);
 		importLog.setDept(dept);
 		mongoOperations.save(importLog);
-		new Thread(new TagMetadataImportExecutor(userName, userId, dept,idPath,dimensionType,tagType, 
-				file, importLog)).start();
+		this.TagMetadataImportExecutor(userName, userId, dept,idPath,dimensionType,tagType, 
+				file, importLog);
 		return "ok";
 	}
 	
@@ -215,78 +215,57 @@ public class TagFileService {
 	/**
 	 *author:zhangkb  time:2020-1-14  desc:标签管理导入
 	 */
-	class TagMetadataImportExecutor implements Runnable{
-		private String dept;
-		private MultipartFile file;
-		private ImportLog importLog;
-		private String userName;
-		private String userId;
-		private String idPath;
-		private String dimensionType;
-		private String tagType;
-		public TagMetadataImportExecutor(String userName, String userId, String dept,
-				String idPath,String dimensionType,String tagType, 
-				MultipartFile file, ImportLog importLog) {
-			this.userName = userName;
-			this.userId = userId;
-			this.dept = dept;
-			this.file = file;
-			this.importLog = importLog;
-			this.idPath = idPath;
-			this.dimensionType = dimensionType;
-			this.tagType = tagType;
-		}
-		@Override
-		public void run() {
-			try {
-				boolean hasOtherFail = false;
-				
-				ImportParams params = new ImportParams();
-				params.setTitleRows(0);
-				params.setHeadRows(1);
-				params.setNeedVerify(true);
-				params.setVerifyHandler(new TagMetadataVerifyHandler());
-				ExcelImportResult<TagMetadata> excelImportResult = ExcelImportUtil.
-						importExcelMore(file.getInputStream(), TagMetadata.class, params);
-				List<String> successIds = new ArrayList<>();
-				List<TagMetadata> tagMetadatas = excelImportResult.getList();
-				for(TagMetadata tagMetadata : tagMetadatas) {
-					//判断元数据名称是否在repo存在
-					String claz = null;
-					if("TABLE".equals(tagMetadata.getMetaModel().toUpperCase())) {
-						claz = "Catalog,Database,Schema,Table";
-					}
-					if("HANAVIEW".equals(tagMetadata.getMetaModel().toUpperCase())) {
-						claz = "Catalog,Database,Schema,HanaView";
-					}
-					Map<String,Object> meta = repoService.getMetaByNamePathAndClass(claz,
-							tagMetadata.getMetaName());
-					if(meta.isEmpty()) {
-						importLog.appendErrorMsg(String.format("第%s行, 元数据名为[%s]的元数据不存在", 
-								tagMetadata.getRowNum(), tagMetadata.getMetaName()));
-						hasOtherFail = true;
-					}else {
-						successIds.add(meta.get("_id").toString());
-					}
+	public void TagMetadataImportExecutor (String userName, String userId, String dept,
+			String idPath,String dimensionType,String tagType, 
+			MultipartFile file, ImportLog importLog){
+		try {
+			boolean hasOtherFail = false;
+			
+			ImportParams params = new ImportParams();
+			params.setTitleRows(0);
+			params.setHeadRows(1);
+			params.setNeedVerify(true);
+			params.setVerifyHandler(new TagMetadataVerifyHandler());
+			ExcelImportResult<TagMetadata> excelImportResult = ExcelImportUtil.
+					importExcelMore(file.getInputStream(), TagMetadata.class, params);
+			List<String> successIds = new ArrayList<>();
+			List<TagMetadata> tagMetadatas = excelImportResult.getList();
+			for(TagMetadata tagMetadata : tagMetadatas) {
+				//判断元数据名称是否在repo存在
+				String claz = null;
+				if("TABLE".equals(tagMetadata.getMetaModel().toUpperCase())) {
+					claz = "Catalog,Database,Schema,Table";
 				}
-				if(!successIds.isEmpty()) {
-					//调用repo接口批量打元数据标签
-					repoService.addTag(dimensionType, idPath, successIds, tagType);
+				if("HANAVIEW".equals(tagMetadata.getMetaModel().toUpperCase())) {
+					claz = "Catalog,Database,Schema,HanaView";
 				}
-				excelImportResult.getFailList().forEach(tag -> {
-					importLog.appendErrorMsg(String.format("第%s行, %s", tag.getRowNum() + params.getTitleRows() + params.getReadRows(), tag.getErrorMsg()));
-				});
-				importLog.setHasFailNum(!excelImportResult.getFailList().isEmpty() || hasOtherFail);
-				importLog.setTotalNum(excelImportResult.getList().size() + excelImportResult.getFailList().size());
-				importLog.setSuccessIds(successIds);
-			} catch (Exception e) {
-				importLog.appendErrorMsg(e.getCause().getMessage());
-			} finally {
-				importLog.setReport(importLog.generateReport());
-				importLog.setEndTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
-				importLog.setHasFinish(true);
-				mongoOperations.save(importLog);
+				Map<String,Object> meta = repoService.getMetaByNamePathAndClass(claz,
+						tagMetadata.getMetaName());
+				if(meta.isEmpty()) {
+					importLog.appendErrorMsg(String.format("第%s行, 元数据名为[%s]的元数据不存在", 
+							tagMetadata.getRowNum(), tagMetadata.getMetaName()));
+					hasOtherFail = true;
+				}else {
+					successIds.add(meta.get("_id").toString());
+				}
+			}
+			if(!successIds.isEmpty()) {
+				//调用repo接口批量打元数据标签
+				repoService.addTag(dimensionType, idPath, successIds, tagType);
 			}
+			excelImportResult.getFailList().forEach(tag -> {
+				importLog.appendErrorMsg(String.format("第%s行, %s", tag.getRowNum() + params.getTitleRows() + params.getReadRows(), tag.getErrorMsg()));
+			});
+			importLog.setHasFailNum(!excelImportResult.getFailList().isEmpty() || hasOtherFail);
+			importLog.setTotalNum(excelImportResult.getList().size() + excelImportResult.getFailList().size());
+			importLog.setSuccessIds(successIds);
+		} catch (Exception e) {
+			importLog.appendErrorMsg(e.getCause().getMessage());
+		} finally {
+			importLog.setReport(importLog.generateReport());
+			importLog.setEndTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
+			importLog.setHasFinish(true);
+			mongoOperations.save(importLog);
 		}
 	}
 	class TagMetadataVerifyHandler implements IExcelVerifyHandler<TagMetadata>{