Merge remote-tracking branch 'origin/dev_import' into develop

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelPoiUtils.java

@@ -255,7 +255,7 @@ public class ExcelPoiUtils {
      * @param <T>
      * @return
      */
-    private static <T> ExcelImportResult<T> importExcelMore(InputStream inputStream,Integer titleRows, Integer headerRows, Class<T> pojoClass) throws IOException {
+    public static <T> ExcelImportResult<T> importExcelMore(InputStream inputStream,Integer titleRows, Integer headerRows, Class<T> pojoClass) throws IOException {
         if (inputStream == null) {
             return null;
         }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java

@@ -42,6 +42,7 @@ import com.epmet.excel.IcCommunitySelfOrganizationExcel;
 import com.epmet.excel.ImportCommunitySelfOrganizationSon;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcCommunitySelfOrganizationService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +51,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -62,6 +64,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("iccommunityselforganization")
+@Slf4j
 public class IcCommunitySelfOrganizationController {
 
     @Autowired
@@ -161,8 +164,19 @@ public class IcCommunitySelfOrganizationController {
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
+        InputStream inputStream = null;
+        try {
+            inputStream = file.getInputStream();
+        }catch (Exception e){
+            ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
+            input.setOperatorId(tokenDto.getUserId());
+            input.setTaskId(result.getData().getTaskId());
+            input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
+            commonServiceOpenFeignClient.finishImportTask(input);
+            log.error("读取文件失败");
+        }
         //2.执行导入程序
-        icCommunitySelfOrganizationService.importCommunitySelfOrganization(tokenDto, response, file, result.getData().getTaskId());
+        icCommunitySelfOrganizationService.importCommunitySelfOrganization(tokenDto, response, inputStream, result.getData().getTaskId());
 
         return new Result();
     }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java

@@ -33,6 +33,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -157,7 +158,7 @@ public interface IcCommunitySelfOrganizationService extends BaseService<IcCommun
      * @author zxc
      * @date 2021/11/25 9:03 上午
      */
-    void importCommunitySelfOrganization(TokenDto tokenDto, HttpServletResponse response, MultipartFile file, String taskId) throws IOException;
+    void importCommunitySelfOrganization(TokenDto tokenDto, HttpServletResponse response, InputStream inputStream, String taskId) throws IOException;
 
     List<IcCommunitySelfOrganizationEntity> queryListById(List<String> communityOrgIds);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@@ -66,6 +66,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -478,13 +479,13 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
     @Override
     //@Transactional(rollbackFor = Exception.class)
     @Async
-    public void importCommunitySelfOrganization(TokenDto tokenDto, HttpServletResponse response, MultipartFile file, String taskId) {
+    public void importCommunitySelfOrganization(TokenDto tokenDto, HttpServletResponse response, InputStream inputStream, String taskId) {
         try {
             log.info("社会自组织导入，子线程开始执行");
             List<CommunitySelfOrgImportExcel> fileList = new ArrayList<>();
             CommunitySelfOrgImportExcel excel = null;
             //1.读取Excel数据
-            ExcelImportResult<ImportCommunitySelfOrganization> testExcelImportResult = ExcelPoiUtils.importExcelMore(file, 0, 2, ImportCommunitySelfOrganization.class);
+            ExcelImportResult<ImportCommunitySelfOrganization> testExcelImportResult = ExcelPoiUtils.importExcelMore(inputStream,0,2,ImportCommunitySelfOrganization.class);
             //2.存在错误行数据时存入错误数据集合中
             for (ImportCommunitySelfOrganization entity : testExcelImportResult.getFailList()) {
                 //打印失败的行 和失败的信息

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

@@ -134,7 +134,6 @@ public class IcNeighborHoodController {
      * @date 2022/2/12 10:47 上午
      */
     @PostMapping("neighborhoodimport")
-    @Transactional(rollbackFor = Exception.class)
     public Result neighborhoodImport(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file,
                               @RequestParam("orgId")String orgId,
                               @RequestParam("orgType")String orgType) throws IOException {
@@ -151,7 +150,6 @@ public class IcNeighborHoodController {
         if (!importTask.success()){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"","存在进行中的导入");
         }
-        log.info("插入任务结果"+ JSON.toJSONString(importTask.getData()));
         InputStream inputStream = null;
         try {
             inputStream = file.getInputStream();
@@ -163,6 +161,7 @@ public class IcNeighborHoodController {
             epmetCommonServiceOpenFeignClient.finishImportTask(input);
             log.error("读取文件失败");
         }
+        log.info("插入任务结果"+ JSON.toJSONString(importTask.getData()));
         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

@@ -29,6 +29,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;
 
@@ -76,5 +77,5 @@ public interface HouseService {
      */
     void allDelete(NeighborHoodManageDelFormDTO formDTO);
 
-    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/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

@@ -365,16 +365,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

@@ -227,7 +227,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     /**
      * @Description  小区信息导入
      * @param formDTO
-     * @param file
+     * @param inputStream
      * @author zxc
      * @date 2022/2/12 11:11 上午
      */

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java

@@ -48,6 +48,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -143,8 +144,19 @@ public class IcPartymemberStyleController {
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
+        InputStream inputStream = null;
+        try {
+            inputStream = file.getInputStream();
+        }catch (Exception e){
+            ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
+            input.setOperatorId(tokenDto.getUserId());
+            input.setTaskId(result.getData().getTaskId());
+            input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
+            commonServiceOpenFeignClient.finishImportTask(input);
+            log.error("读取文件失败");
+        }
         //2.执行导入程序
-        icPartymemberStyleService.importData(tokenDto, response, file, result.getData().getTaskId());
+        icPartymemberStyleService.importData(tokenDto, response, inputStream, result.getData().getTaskId());
 
         return new Result();
     }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java

@@ -29,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -108,7 +109,7 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
      * @Author zhaoqifeng
      * @Date 2021/11/29 11:01
      */
-    void importData(TokenDto tokenDto, HttpServletResponse response, MultipartFile file, String taskId) throws IOException;
+    void importData(TokenDto tokenDto, HttpServletResponse response, InputStream inputStream, String taskId) throws IOException;
 
     /**
      * 数据分析-党员风采列表查询

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -81,6 +81,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -259,12 +260,12 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
     @Override
     //@Transactional(rollbackFor = Exception.class)
     @Async
-    public void importData(TokenDto tokenDto, HttpServletResponse response, MultipartFile file, String taskId) {
+    public void importData(TokenDto tokenDto, HttpServletResponse response, InputStream inputStream, String taskId) {
         try {
             log.info("党员风采导入，子线程开始执行");
             List<PartyMemberImportExcel> fileList = new ArrayList<>();
             PartyMemberImportExcel excel = null;
-            ExcelImportResult<IcPartymemberStyleImportExcel> importResult = ExcelPoiUtils.importExcelMore(file, 0, 1, IcPartymemberStyleImportExcel.class);
+            ExcelImportResult<IcPartymemberStyleImportExcel> importResult = ExcelPoiUtils.importExcelMore(inputStream, 0, 1, IcPartymemberStyleImportExcel.class);
 
             List<IcPartymemberStyleImportExcel> failList = importResult.getFailList();
             //存放错误数据行号