Merge branch 'wxz_temp_file' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java

@@ -25,6 +25,7 @@ import com.epmet.dto.result.IcVaccineListResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcVaccineService;
+import com.epmet.utils.ImportTaskUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
@@ -138,12 +139,8 @@ public class IcVaccineController  implements ResultDataResolver {
         }
 
         // 2.生成导入任务记录
-        ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO();
+        ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(
-        importTaskForm.setOperatorId(userId);
+                ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_VACCINE),
-        importTaskForm.setBizType(ImportTaskConstants.BIZ_TYPE_IC_VACCINE);
-        importTaskForm.setOriginFileName(originalFilename);
-
-        ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm),
                 ServiceConstant.EPMET_COMMON_SERVICE,
                 EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
                 "excel导入疫苗接种信息错误",

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -49,6 +49,7 @@ import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.http.entity.ContentType;
+import org.apache.poi.util.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -329,7 +330,6 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
 
             EasyExcel.read(filePath.toFile(), IcNatImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead();
 
-            Path errorDescFile = null;
             String errorDesFileUrl = null;
 
             List<IcNatImportExcelData.RowRemarkMessage> errorRows = listener.getErrorRows();
@@ -341,16 +341,19 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             errorRows.addAll(otherRows);
 
             // 生成并上传描述文件
+            OutputStream os = null;
+            FileItem fileItem = null;
             if (errorRows.size() > 0) {
                 try {
                     // 文件生成
                     Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import", "error_des");
-                    String fileName = UUID.randomUUID().toString().concat(".xlsx");
+                    String timeMillis = String.valueOf(System.currentTimeMillis());
-                    errorDescFile = errorDescDir.resolve(fileName);
+                    String fileName = "icnat_import_error_".concat(timeMillis).concat(".xlsx");
 
-                    FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile());
+                    fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile())
-                    FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName);
+                            .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName);
-                    OutputStream os = fileItem.getOutputStream();
+
+                    os = fileItem.getOutputStream();
 
                     EasyExcel.write(os, IcNatImportExcelData.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows);
                     // 文件上传oss
@@ -358,10 +361,12 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
                     if (errorDesFileUploadResult.success()) {
                         errorDesFileUrl = errorDesFileUploadResult.getData().getUrl();
                     }
-
                 } finally {
-                    if (Files.exists(errorDescFile)) {
+                    IOUtils.closeQuietly(os);
-                        Files.delete(errorDescFile);
+                    try {
+                        fileItem.delete();
+                    } catch (Exception e){
+                        log.error("【核酸检测导入】删除临时描述文件失败:{}", ExceptionUtils.getErrorStackTrace(e));
                     }
                 }
             }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -25,6 +25,7 @@ import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.commons.tools.utils.FileUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcResiUserDao;
@@ -1244,8 +1245,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         // 文件名
         String resultDescFileName = UUID.randomUUID().toString().concat(".xls");
 
-        FileItemFactory factory = new DiskFileItemFactory(16, null);
+        FileItem fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, FileUtils.getAndCreateDirUnderEpmetFilesDir("temp").toFile())
-        FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, resultDescFileName);
+                .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, resultDescFileName);
         OutputStream os = fileItem.getOutputStream();
         Result<UploadImgResultDTO> uploadResult = null;
         try {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java

@@ -37,6 +37,7 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.service.IcVaccineService;
 import com.epmet.service.UserService;
+import com.epmet.utils.ImportTaskUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -45,6 +46,7 @@ import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.http.entity.ContentType;
+import org.apache.poi.util.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -177,7 +179,6 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
 
             EasyExcel.read(filePath.toFile(), IcVaccineImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead();
 
-            Path errorDescFile = null;
             String errorDesFileUrl = null;
 
             List<IcVaccineImportExcelData.RowRemarkMessage> errorRows = listener.getErrorRows();
@@ -189,16 +190,17 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
             errorRows.addAll(otherRows);
 
             // 生成并上传描述文件
+            OutputStream os = null;
+            FileItem fileItem = null;
             if (errorRows.size() > 0) {
                 try {
                     // 文件生成
                     Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_vaccine", "import", "error_des");
                     String fileName = UUID.randomUUID().toString().concat(".xlsx");
-                    errorDescFile = errorDescDir.resolve(fileName);
 
-                    FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile());
+                    fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile())
-                    FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName);
+                            .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName);
-                    OutputStream os = fileItem.getOutputStream();
+                    os = fileItem.getOutputStream();
 
                     EasyExcel.write(os, IcNatImportExcelData.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows);
                     // 文件上传oss
@@ -208,20 +210,23 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
                     }
 
                 } finally {
-                    if (Files.exists(errorDescFile)) {
+                    IOUtils.closeQuietly(os);
-                        Files.delete(errorDescFile);
+                    if (!fileItem.isInMemory()) {
+                        try {
+                            fileItem.delete();
+                        } catch (Exception e){
+                            log.error("【疫苗接种导入】删除错误描述临时文件失败:{}", ExceptionUtils.getErrorStackTrace(e));
+                        }
                     }
                 }
             }
 
-            ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO();
+            Result result = ImportTaskUtils.finishImportTask(
-            importFinishTaskForm.setTaskId(importTaskId);
+                    importTaskId,
-            importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS);
+                    failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,
-            importFinishTaskForm.setOperatorId(userId);
+                    errorDesFileUrl,
-            importFinishTaskForm.setResultDesc("");
+                    "");
-            importFinishTaskForm.setResultDescFilePath(errorDesFileUrl);
 
-            Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm);
             if (!result.success()) {
                 log.error("【疫苗接种导入】finishImportTask失败");
             }