From 31cd47027aa509c8bc58ceb22bd3c01a15636b74 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 7 Mar 2022 16:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95async?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/IcNeighborHoodController.java      | 15 ++++++++++++++-
 .../com/epmet/service/IcNeighborHoodService.java  |  3 ++-
 .../service/impl/IcNeighborHoodServiceImpl.java   | 10 +---------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
index ab912450f5..85797b6e4a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
@@ -45,6 +45,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -151,7 +152,19 @@ public class IcNeighborHoodController {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"","存在进行中的导入");
         }
         log.info("插入任务结果"+ JSON.toJSONString(importTask.getData()));
-        icNeighborHoodService.neighborhoodImport(formDTO,file,importTask);
+        InputStream inputStream = null;
+        try {
+            inputStream = file.getInputStream();
+        }catch (Exception e){
+            log.error("读取文件失败");
+        }finally {
+            ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
+            input.setOperatorId(formDTO.getUserId());
+            input.setTaskId(importTask.getData().getTaskId());
+            input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
+            epmetCommonServiceOpenFeignClient.finishImportTask(input);
+        }
+        icNeighborHoodService.neighborhoodImport(formDTO,inputStream,importTask);
         return new Result();
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
index 1d6193834f..1f32607a65 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
@@ -31,6 +31,7 @@ import com.epmet.entity.IcPropertyManagementEntity;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -129,7 +130,7 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
      * @author zxc
      * @date 2022/2/12 11:11 上午
      */
-    Result neighborhoodImport(ImportInfoFormDTO formDTO, MultipartFile file,Result<ImportTaskCommonResultDTO> importTask) throws IOException;
+    Result neighborhoodImport(ImportInfoFormDTO formDTO, InputStream inputStream, Result<ImportTaskCommonResultDTO> importTask) throws IOException;
 
     /**
      * 获取导入小区，楼栋，单元ID
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index fd7651a7b5..fa0ab9072e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -233,20 +233,12 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
      */
     @Override
     @Async
-    public Result neighborhoodImport(ImportInfoFormDTO formDTO, MultipartFile file,Result<ImportTaskCommonResultDTO> importTask) {
+    public Result neighborhoodImport(ImportInfoFormDTO formDTO, InputStream inputStream,Result<ImportTaskCommonResultDTO> importTask) {
 //        executorService.submit(() -> {
             //        importNeighbor(formDTO,file,importTask);
             log.info("neighborhoodImport thread start=====");
             ExcelReader excelReader = null;
             try {
-                InputStream inputStream = null;
-                try {
-                    inputStream = file.getInputStream();
-                } catch (IOException e) {
-                    log.error(e.getMessage());
-                    throw new EpmetException("读取文件失败");
-                }
-
                 excelReader = EasyExcel.read(inputStream).build();
                 // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener
                 ReadSheet readSheet = EasyExcel.readSheet(0).head(NeighborHoodInfoModel.class)