小区，楼宇，房屋导入微调

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java

@@ -53,6 +53,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -224,7 +225,18 @@ public class BuildingController {
         if (!importTask.success()){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"","存在进行中的导入");
         }
-        buildingService.buildingImportExcel(formDTO,file,importTask);
+        InputStream inputStream = null;
+        try {
+            inputStream = file.getInputStream();
+        }catch (Exception e){
+            ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
+            input.setOperatorId(formDTO.getUserId());
+            input.setTaskId(importTask.getData().getTaskId());
+            input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
+            epmetCommonServiceOpenFeignClient.finishImportTask(input);
+            log.error("读取文件失败");
+        }
+        buildingService.buildingImportExcel(formDTO, inputStream, importTask);
         return new Result();
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -274,7 +274,18 @@ public class HouseController implements ResultDataResolver {
         if (!importTask.success()){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"","存在进行中的导入");
         }
-        houseService.dispose(file,formDTO,importTask);
+        InputStream inputStream = null;
+        try {
+            inputStream = file.getInputStream();
+        }catch (Exception e){
+            ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
+            input.setOperatorId(formDTO.getUserId());
+            input.setTaskId(importTask.getData().getTaskId());
+            input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
+            epmetCommonServiceOpenFeignClient.finishImportTask(input);
+            log.error("读取文件失败");
+        }
+        houseService.dispose(inputStream,formDTO,importTask);
         return new Result<>();
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java

@@ -44,6 +44,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;
 
@@ -148,8 +149,19 @@ public class IcNeighborHoodController {
         if (!importTask.success()){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"","存在进行中的导入");
         }
+        InputStream inputStream = null;
+        try {
+            inputStream = file.getInputStream();
+        }catch (Exception e){
+            ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
+            input.setOperatorId(formDTO.getUserId());
+            input.setTaskId(importTask.getData().getTaskId());
+            input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
+            epmetCommonServiceOpenFeignClient.finishImportTask(input);
+            log.error("读取文件失败");
+        }
         log.info("插入任务结果"+ JSON.toJSONString(importTask.getData()));
-        icNeighborHoodService.neighborhoodImport(formDTO,file,importTask);
+        icNeighborHoodService.neighborhoodImport(formDTO,inputStream,importTask);
         return new Result();
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java

@@ -31,6 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 
 /**
@@ -75,6 +76,6 @@ public interface BuildingService {
      * @author zxc
      * @date 2022/2/13 10:18 上午
      */
-    Result buildingImportExcel(ImportInfoFormDTO formDTO, MultipartFile file,Result<ImportTaskCommonResultDTO> importTask) throws IOException;
+    Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream, Result<ImportTaskCommonResultDTO> importTask) throws IOException;
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

@@ -28,6 +28,7 @@ import com.epmet.excel.IcHouseExcel;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Set;
 
@@ -67,5 +68,5 @@ public interface HouseService {
 
     List<HouseInfoDTO> queryListHouseInfo(Set<String> houseIds, String customerId);
 
-    Result dispose(MultipartFile file, ImportInfoFormDTO formDTO, Result<ImportTaskCommonResultDTO> importTask);
+    Result dispose(InputStream inputStream, ImportInfoFormDTO formDTO, Result<ImportTaskCommonResultDTO> importTask);
 }

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

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@@ -406,16 +406,10 @@ public class BuildingServiceImpl implements BuildingService {
      * @date 2022/2/13 10:15 上午
      */
     @Override
-    public Result buildingImportExcel(ImportInfoFormDTO formDTO, MultipartFile file,Result<ImportTaskCommonResultDTO> importTask) throws IOException {
+    public Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream,Result<ImportTaskCommonResultDTO> importTask) throws IOException {
         executorService.submit(() -> {
             ExcelReader excelReader = null;
             try {
-                InputStream inputStream = null;
-                try {
-                    inputStream = file.getInputStream();
-                } catch (IOException e) {
-                    log.error("读取文件失败");
-                }
                 excelReader = EasyExcel.read(inputStream).build();
                 // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener
                 ReadSheet readSheet = EasyExcel.readSheet(0).head(BuildingInfoModel.class)

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -355,16 +355,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     }
 
     @Override
-    public Result dispose(MultipartFile file, ImportInfoFormDTO formDTO, Result<ImportTaskCommonResultDTO> importTask) {
+    public Result dispose(InputStream inputStream, ImportInfoFormDTO formDTO, Result<ImportTaskCommonResultDTO> importTask) {
         executorService.submit(() -> {
             ExcelReader excelReader = null;
             try {
-                InputStream inputStream = null;
-                try {
-                    inputStream = file.getInputStream();
-                } catch (IOException e) {
-                    log.error("读取文件失败");
-                }
                 excelReader = EasyExcel.read(inputStream).build();
                 // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener
                 ReadSheet readSheet = EasyExcel.readSheet(0).head(HouseInfoModel.class)

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -226,24 +226,17 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     /**
      * @Description  小区信息导入
      * @param formDTO
-     * @param file
+     * @param inputStream
      * @author zxc
      * @date 2022/2/12 11:11 上午
      */
     @Override
-    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) {
-                    throw new EpmetException("读取文件失败");
-                }
-
                 excelReader = EasyExcel.read(inputStream).build();
                 // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener
                 ReadSheet readSheet = EasyExcel.readSheet(0).head(NeighborHoodInfoModel.class)