Async

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

@@ -25,20 +25,22 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.constant.ImportErrorMsgConstants;
+import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcBuildingUnitDao;
 import com.epmet.dto.BuildingTreeLevelDTO;
-import com.epmet.dto.form.IcBulidingFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.IcBulidingUnitFormDTO;
-import com.epmet.dto.form.ImportInfoFormDTO;
-import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
 import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.BuildingResultPagedDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.entity.IcBuildingUnitEntity;
 import com.epmet.excel.IcBuildingExcel;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.BuildingService;
 import com.epmet.service.IcBuildingService;
 import com.epmet.service.NeighborHoodService;
@@ -66,17 +68,12 @@ import java.util.stream.Collectors;
 @RequestMapping("building")
 public class BuildingController {
 
-
-    @Autowired
-    private NeighborHoodService neighborHoodService;
-
-    @Autowired
-    private IcBuildingService icBuildingService;
     @Autowired
     private BuildingService buildingService;
     @Autowired
     private IcBuildingUnitDao icBuildingUnitDao;
-
+    @Autowired
+    private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
 
 
     @PostMapping("buildinglist")
@@ -219,7 +216,16 @@ public class BuildingController {
         formDTO.setOrgType(orgType);
         formDTO.setOrgId(orgId);
         formDTO.setUserId(tokenDTO.getUserId());
-        return buildingService.buildingImportExcel(formDTO,file);
+        ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
+        importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_BUILDING);
+        importFormDTO.setOperatorId(formDTO.getUserId());
+        importFormDTO.setOriginFileName(ImportErrorMsgConstants.BUILDING_ERROR_NAME);
+        Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
+        if (!importTask.success()){
+            throw new EpmetException("当前存在上传任务");
+        }
+        buildingService.buildingImportExcel(formDTO,file,importTask);
+        return new Result();
     }
 
     /**

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

@@ -50,15 +50,22 @@ import com.epmet.service.IcNeighborHoodService;
 import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.http.MimeHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Field;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 
@@ -83,8 +90,6 @@ public class HouseController implements ResultDataResolver {
     @Autowired
     private IcHouseRedis icHouseRedis;
     @Autowired
-    private IcNeighborHoodService neighborHoodService;
-    @Autowired
     private IcHouseService icHouseService;
     @Autowired
     private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
@@ -255,52 +260,22 @@ public class HouseController implements ResultDataResolver {
     @PostMapping("houseimport")
     public Result houseImport(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file,
                               @RequestParam("orgId")String orgId,
-                              @RequestParam("orgType")String orgType){
+                              @RequestParam("orgType")String orgType,HttpServletRequest multipartRequest){
         ImportInfoFormDTO formDTO = new ImportInfoFormDTO();
         formDTO.setCustomerId(tokenDTO.getCustomerId());
         formDTO.setOrgType(orgType);
         formDTO.setOrgId(orgId);
         formDTO.setUserId(tokenDTO.getUserId());
-        ExcelReader excelReader = null;
+        ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
-        try {
+        importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_HOUSE);
-            InputStream inputStream = null;
+        importFormDTO.setOperatorId(formDTO.getUserId());
-            try {
+        importFormDTO.setOriginFileName(ImportErrorMsgConstants.HOUSE_ERROR_NAME);
-                inputStream = file.getInputStream();
+        Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
-            } catch (IOException e) {
+        if (!importTask.success()){
-                return new Result<String>().error("读取文件失败");
+            throw new EpmetException("当前存在上传任务");
-            }
-            ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
-            importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_HOUSE);
-            importFormDTO.setOperatorId(formDTO.getUserId());
-            importFormDTO.setOriginFileName(ImportErrorMsgConstants.HOUSE_ERROR_NAME);
-            Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
-            if (!importTask.success()){
-                throw new EpmetException("创建任务失败");
-            }
-            excelReader = EasyExcel.read(inputStream).build();
-            // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener
-            ReadSheet readSheet = EasyExcel.readSheet(0).head(HouseInfoModel.class)
-                    .registerReadListener(new ImportHouseInfoListener(formDTO,icBuildingDao,icHouseRedis,neighborHoodService,icHouseService,epmetCommonServiceOpenFeignClient,importTask.getData().getTaskId()))
-                    .build();
-            excelReader.read(readSheet);
-        } finally {
-            if (excelReader != null) {
-                excelReader.finish();
-            }
-        }
-        ImportResultDTO dto = icHouseRedis.getImportResultDTO(formDTO.getCustomerId(), formDTO.getUserId());
-        if (null == dto){
-            return new Result<>();
-        }
-        List<Integer> nums = dto.getNums();
-        Integer num = dto.getNum();
-        String s = "共%s条数据，导入成功%s条。";
-        if (nums.size() > NumConstant.ZERO){
-            Collections.sort(nums);
-            s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败";
-            return new Result<>().error(9999,String.format(s,num,num - nums.size()));
         }
-        return new Result<>().error(9999,String.format(s,num,num));
+        houseService.dispose(file,formDTO,importTask);
+        return new Result<>();
     }
 
 }

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

@@ -19,6 +19,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -27,8 +28,13 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.constant.ImportErrorMsgConstants;
+import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcNeighborHoodService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -51,6 +57,8 @@ public class IcNeighborHoodController {
 
     @Autowired
     private IcNeighborHoodService icNeighborHoodService;
+    @Autowired
+    private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
 
     @GetMapping("page")
     public Result<PageData<IcNeighborHoodDTO>> page(@RequestParam Map<String, Object> params){
@@ -128,7 +136,16 @@ public class IcNeighborHoodController {
         formDTO.setOrgType(orgType);
         formDTO.setOrgId(orgId);
         formDTO.setUserId(tokenDTO.getUserId());
-        return icNeighborHoodService.neighborhoodImport(formDTO,file);
+        ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
+        importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_NEIGHBOR_HOOD);
+        importFormDTO.setOperatorId(formDTO.getUserId());
+        importFormDTO.setOriginFileName(ImportErrorMsgConstants.NEIGHBORHOOD_ERROR_NAME);
+        Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
+        if (!importTask.success()){
+            throw new EpmetException("当前存在上传任务");
+        }
+        icNeighborHoodService.neighborhoodImport(formDTO,file,importTask);
+        return new Result();
     }
 
 }

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

@@ -25,6 +25,7 @@ import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
 import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.BuildingResultPagedDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.excel.IcBuildingExcel;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -74,6 +75,6 @@ public interface BuildingService {
      * @author zxc
      * @date 2022/2/13 10:18 上午
      */
-    Result buildingImportExcel(ImportInfoFormDTO formDTO, MultipartFile file) throws IOException;
+    Result buildingImportExcel(ImportInfoFormDTO formDTO, MultipartFile file,Result<ImportTaskCommonResultDTO> importTask) throws IOException;
 
 }

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

@@ -17,11 +17,15 @@
 
 package com.epmet.service;
 
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IcHouseFormDTO;
+import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.excel.IcHouseExcel;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -62,4 +66,6 @@ public interface HouseService {
     void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws  Exception;
 
     List<HouseInfoDTO> queryListHouseInfo(Set<String> houseIds, String customerId);
+
+    Result dispose(MultipartFile file, ImportInfoFormDTO formDTO, Result<ImportTaskCommonResultDTO> importTask);
 }

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

@@ -24,6 +24,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.entity.IcNeighborHoodEntity;
 import com.epmet.entity.IcNeighborHoodPropertyEntity;
 import com.epmet.entity.IcPropertyManagementEntity;
@@ -128,7 +129,7 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
      * @author zxc
      * @date 2022/2/12 11:11 上午
      */
-    Result neighborhoodImport(ImportInfoFormDTO formDTO, MultipartFile file) throws IOException;
+    void neighborhoodImport(ImportInfoFormDTO formDTO, MultipartFile file,Result<ImportTaskCommonResultDTO> importTask) throws IOException;
 
     /**
      * 获取导入小区，楼栋，单元ID

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

@@ -46,6 +46,8 @@ import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -61,6 +63,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Service
+@EnableAsync
 public class BuildingServiceImpl implements BuildingService {
 
 
@@ -401,7 +404,8 @@ public class BuildingServiceImpl implements BuildingService {
      * @date 2022/2/13 10:15 上午
      */
     @Override
-    public Result buildingImportExcel(ImportInfoFormDTO formDTO, MultipartFile file) throws IOException {
+    @Async
+    public Result buildingImportExcel(ImportInfoFormDTO formDTO, MultipartFile file,Result<ImportTaskCommonResultDTO> importTask) throws IOException {
         ExcelReader excelReader = null;
         try {
             InputStream inputStream = null;
@@ -410,14 +414,6 @@ public class BuildingServiceImpl implements BuildingService {
             } catch (IOException e) {
                 return new Result<String>().error("读取文件失败");
             }
-            ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
-            importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_BUILDING);
-            importFormDTO.setOperatorId(formDTO.getUserId());
-            importFormDTO.setOriginFileName(ImportErrorMsgConstants.BUILDING_ERROR_NAME);
-            Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
-            if (!importTask.success()){
-                throw new EpmetException("创建任务失败");
-            }
             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

@@ -2,6 +2,9 @@ package com.epmet.service.impl;
 
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelReader;
+import com.alibaba.excel.read.metadata.ReadSheet;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -14,6 +17,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcBuildingDao;
 import com.epmet.dao.IcBuildingUnitDao;
 import com.epmet.dao.IcHouseDao;
@@ -23,15 +27,20 @@ import com.epmet.dto.IcBuildingDTO;
 import com.epmet.dto.IcBuildingUnitDTO;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.IcHouseFormDTO;
+import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.entity.IcHouseEntity;
 import com.epmet.enums.HousePurposeEnums;
 import com.epmet.enums.HouseRentFlagEnums;
 import com.epmet.enums.HouseTypeEnums;
 import com.epmet.excel.IcHouseExcel;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.model.HouseInfoModel;
+import com.epmet.model.ImportHouseInfoListener;
 import com.epmet.redis.IcHouseRedis;
 import com.epmet.service.HouseService;
 import com.epmet.service.IcBuildingService;
@@ -42,17 +51,23 @@ import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Service
+@EnableAsync
 public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
 
@@ -77,6 +92,11 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     private IcHouseRedis icHouseRedis;
     @Autowired
     private AgencyService agencyservice;
+    @Autowired
+    private IcNeighborHoodService neighborHoodService;
+    @Autowired
+    private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
+
 
 
     @Override
@@ -329,4 +349,29 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         });
         return result;
     }
+
+    @Async
+    @Override
+    public Result dispose(MultipartFile file, ImportInfoFormDTO formDTO, Result<ImportTaskCommonResultDTO> importTask) {
+        ExcelReader excelReader = null;
+        try {
+            InputStream inputStream = null;
+            try {
+                inputStream = file.getInputStream();
+            } catch (IOException e) {
+                return new Result<String>().error("读取文件失败");
+            }
+            excelReader = EasyExcel.read(inputStream).build();
+            // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener
+            ReadSheet readSheet = EasyExcel.readSheet(0).head(HouseInfoModel.class)
+                    .registerReadListener(new ImportHouseInfoListener(formDTO,icBuildingDao,icHouseRedis,neighborHoodService,icHouseService,epmetCommonServiceOpenFeignClient,importTask.getData().getTaskId()))
+                    .build();
+            excelReader.read(readSheet);
+        } finally {
+            if (excelReader != null) {
+                excelReader.finish();
+            }
+        }
+        return new Result();
+    }
 }

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

@@ -73,6 +73,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -93,6 +95,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
+@EnableAsync
 public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao, IcNeighborHoodEntity> implements IcNeighborHoodService {
 
     @Autowired
@@ -230,21 +233,9 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
      * @date 2022/2/12 11:11 上午
      */
     @Override
-    public Result neighborhoodImport(ImportInfoFormDTO formDTO, MultipartFile file) throws IOException {
+    @Async
-        /*ExcelImportResult<IcNeighborHoodExcel> importResult = ExcelPoiUtils.importExcelMore(file, 0, 1, IcNeighborHoodExcel.class);
+    public void neighborhoodImport(ImportInfoFormDTO formDTO, MultipartFile file,Result<ImportTaskCommonResultDTO> importTask) throws IOException {
-        List<IcNeighborHoodExcel> failList = importResult.getFailList();
+        importNeighbor(formDTO,file,importTask);
-        //存放错误数据行号
-        List<Integer> numList = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(failList)){
-            for ( IcNeighborHoodExcel entity : failList) {
-                //打印失败的行 和失败的信息
-                log.error("第{}行,{}",entity.getRowNum(),entity.getErrorMsg());
-                numList.add(entity.getRowNum());
-            }
-        }
-        List<IcNeighborHoodExcel> result =importResult.getList();
-        return disposeImportNeighborhood(formDTO,result);*/
-        return importNeighbor(formDTO,file);
     }
 
     /**
@@ -407,7 +398,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         return new Result().ok(str);
     }
 
-    public Result importNeighbor(ImportInfoFormDTO formDTO, MultipartFile file){
+    public Result importNeighbor(ImportInfoFormDTO formDTO, MultipartFile file,Result<ImportTaskCommonResultDTO> importTask){
         ExcelReader excelReader = null;
         try {
             InputStream inputStream = null;
@@ -416,14 +407,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             } catch (IOException e) {
                 return new Result<String>().error("读取文件失败");
             }
-            ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
+
-            importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_NEIGHBOR_HOOD);
-            importFormDTO.setOperatorId(formDTO.getUserId());
-            importFormDTO.setOriginFileName(ImportErrorMsgConstants.NEIGHBORHOOD_ERROR_NAME);
-            Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
-            if (!importTask.success()){
-                throw new EpmetException("创建任务失败");
-            }
             excelReader = EasyExcel.read(inputStream).build();
             // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener
             ReadSheet readSheet = EasyExcel.readSheet(0).head(NeighborHoodInfoModel.class)
@@ -435,19 +419,8 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
                 excelReader.finish();
             }
         }
-        ImportResultDTO dto = icHouseRedis.getImportResultDTO(formDTO.getCustomerId(), formDTO.getUserId());
+
-        if (null == dto){
+        return new Result<>();
-            return new Result<>();
-        }
-        List<Integer> nums = dto.getNums();
-        Integer num = dto.getNum();
-        String s = "共%s条数据，导入成功%s条。";
-        if (nums.size() > NumConstant.ZERO){
-            Collections.sort(nums);
-            s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败";
-            return new Result<>().error(9999,String.format(s,num,num - nums.size()));
-        }
-        return new Result<>().error(9999,String.format(s,num,num));
     }
 
     /**