修改文件导入逻辑

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

 package com.keymobile.tagmanager.service;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -105,8 +104,9 @@ public class TagFileService {
 		importLog.setCreator(userName);
 		importLog.setDept(dept);
 		mongoOperations.save(importLog);
+		InputStream inputStream = file.getInputStream();
 		new Thread(new TagMetadataImportExecutor(userName, userId, dept,idPath,dimensionType,tagType, 
-				file, importLog)).start();
+				inputStream, importLog)).start();
 		return "ok";
 	}
 	
@@ -218,7 +218,8 @@ public class TagFileService {
 		importLog.setCreator(userName);
 		importLog.setDept(dept);
 		mongoOperations.save(importLog);
-		new Thread(new ExcelImportExecutor(userName, userId, dept, file, importLog)).start();
+		InputStream inputStream = file.getInputStream();
+		new Thread(new ExcelImportExecutor(userName, userId, dept, inputStream, importLog)).start();
 		return "ok";
 	}
 	
@@ -312,19 +313,19 @@ public class TagFileService {
 		private String idPath;
 		private String dimensionType;
 		private String tagType;
-		private MultipartFile file;
+		private InputStream inputStream;
 		private ImportLog importLog;
 		
 		public TagMetadataImportExecutor(String userName, String userId, String dept,
 				String idPath,String dimensionType,String tagType, 
-				MultipartFile file, ImportLog importLog) {
+				InputStream inputStream, ImportLog importLog) {
 			this.userName = userName;
 			this.userId = userId;
 			this.dept = dept;
 			this.idPath = idPath;
 			this.dimensionType = dimensionType;
 			this.tagType = tagType;
-			this.file = file;
+			this.inputStream = inputStream;
 			this.importLog = importLog;
 		}
 		@Override
@@ -338,7 +339,7 @@ public class TagFileService {
 				params.setNeedVerify(true);
 				params.setVerifyHandler(new TagMetadataVerifyHandler());
 				ExcelImportResult<TagMetadata> excelImportResult = ExcelImportUtil.
-						importExcelMore(file.getInputStream(), TagMetadata.class, params);
+						importExcelMore(inputStream, TagMetadata.class, params);
 				List<String> successIds = new ArrayList<>();
 				List<TagMetadata> tagMetadatas = excelImportResult.getList();
 				for(TagMetadata tagMetadata : tagMetadatas) {
@@ -414,16 +415,16 @@ public class TagFileService {
 	
 	class ExcelImportExecutor implements Runnable{
 		private String dept;
-		private MultipartFile file;
+		private InputStream inputStream;
 		private ImportLog importLog;
 		private String userName;
 		private String userId;
 		public ExcelImportExecutor(String userName, String userId, String dept, 
-				MultipartFile file, ImportLog importLog) {
+				InputStream inputStream, ImportLog importLog) {
 			this.userName = userName;
 			this.userId = userId;
 			this.dept = dept;
-			this.file = file;
+			this.inputStream = inputStream;
 			this.importLog = importLog;
 		}
 		@Override
@@ -438,7 +439,7 @@ public class TagFileService {
 				params.setHeadRows(1);
 				params.setNeedVerify(true);
 				params.setVerifyHandler(new ExcelVerifyHandler(pathTags));
-				ExcelImportResult<Tag> excelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), Tag.class, params);
+				ExcelImportResult<Tag> excelImportResult = ExcelImportUtil.importExcelMore(inputStream, Tag.class, params);
 				List<String> successIds = new ArrayList<>();
 				List<Tag> tags = excelImportResult.getList();
 				//author:zhangkb  time:2020-3-12  desc:excel解析到的标签路径'\'改成逗号