修改：居民信息导入模板下载

修改：居民信息导入，如果未全成功，那么保留临时上传的那个excel文件，供排查问题

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

@@ -72,6 +72,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
@@ -135,7 +136,7 @@ public class IcResiUserController implements ResultDataResolver {
      * 模板枚举
      */
     public enum IcUserTemplateEnums {
-        IC_RESI_IMPORT_TEMPLATE("excel/ic_resi_info_import_cid_for_easy_excel.xls", "居民信息导入模板.xls"),
+        IC_RESI_IMPORT_TEMPLATE("excel/ic_resi_import_template.xls", "居民信息导入模板.xls"),
         IC_RESI_EXPORT_TEMPLATE("excel/ic_resi_info_cid_for_easy_excel.xlsx", "居民信息导出模板.xlsx");
 
         private String pathInApp;
@@ -157,18 +158,13 @@ public class IcResiUserController implements ResultDataResolver {
 
     {
         // 初始化上传目录
-        String home = System.getProperty("user.home");
+        try {
-        Path importDir = Paths.get(home, "epmet_files", "ic_user_import");
+            IC_RESI_UPLOAD_DIR = com.epmet.commons.tools.utils.FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_user_import");
-        if (Files.notExists(importDir)) {
+        } catch (IOException e) {
-            try {
+            log.error("初始化居民信息上传目录失败:{}", ExceptionUtils.getErrorStackTrace(e));
-                Files.createDirectories(importDir);
-            } catch (IOException e) {
-                log.error("创建数字赋能平台上传目录失败");
-            }
         }
-        IC_RESI_UPLOAD_DIR = importDir;
 
-        Path exportDir = Paths.get(home, "epmet_files", "ic_user_export");
+        Path exportDir = Paths.get(System.getProperty("user.home"), "epmet_files", "ic_user_export");
         if (Files.notExists(exportDir)) {
             try {
                 Files.createDirectories(exportDir);
@@ -469,10 +465,10 @@ public class IcResiUserController implements ResultDataResolver {
 
         // 三.异步执行导入
         executorService.execute(() -> {
-
+            boolean isAllSuccess = false;
             try {
                 List<FormItemResult> formItemList = icResiUserService.listFormItems(customerId,IcFormCodeEnum.RESI_BASE_INFO.getCode());
-                icResiUserImportService.importIcResiInfoFromExcel(importTaskId, formItemList, importTempFileSavePath.toString(), response, IC_RESI_UPLOAD_DIR);
+                isAllSuccess = icResiUserImportService.importIcResiInfoFromExcel(importTaskId, formItemList, importTempFileSavePath.toString(), response, IC_RESI_UPLOAD_DIR);
             } catch (Throwable e) {
                 String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
                 log.error("【导入居民信息失败】导入失败：{}", errorMsg);
@@ -488,8 +484,13 @@ public class IcResiUserController implements ResultDataResolver {
                 icResiUserImportService.finishImportTask(importTaskId, operatorId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, resultDesc, null);
             } finally {
                 try {
+                    // 都导入成功了没问题，才删除
                     if (importTempFileSavePath != null){
-                        Files.delete(importTempFileSavePath);
+                        if (isAllSuccess) {
+                            Files.delete(importTempFileSavePath);
+                        } else {
+                            log.error("【导入居民信息】未完全成功，上传文件：{}", importTempFileSavePath);
+                        }
                     }
                 } catch (IOException e) {
                     log.error("【导入居民信息失败】清理上传的文件失败：{}", ExceptionUtils.getErrorStackTrace(e));
@@ -585,28 +586,30 @@ public class IcResiUserController implements ResultDataResolver {
 
     /**
      * 下载ic居民信息导入excel模板
-     * @param loginUserInfo
      * @return
      */
     @PostMapping("import/download-template")
-    public ResponseEntity<byte[]> downloadIcResiDownloadTemplate(@LoginUser TokenDto loginUserInfo) {
+    public void downloadIcResiDownloadTemplate(HttpServletResponse response) {
-        String customerId = loginUserInfo.getCustomerId();
+        InputStream is = null;
-
+        ServletOutputStream os = null;
         try {
-            File icResiImportTemplateFile = getIcResiTemplateFile(customerId, IcUserTemplateEnums.IC_RESI_IMPORT_TEMPLATE);
+            os = response.getOutputStream();
+
+            is = this.getClass().getClassLoader().getResourceAsStream(IcUserTemplateEnums.IC_RESI_IMPORT_TEMPLATE.getPathInApp());
 
-            HttpHeaders headers = new HttpHeaders();
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
-            headers.add("Access-Control-Expose-Headers", "Content-Disposition");
+            response.setHeader("content-Type", "application/vnd.ms-excel");
-            headers.add("content-Type", "application/vnd.ms-excel");
+            response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(IcUserTemplateEnums.IC_RESI_IMPORT_TEMPLATE.getTemplateName(), "UTF-8"));
-            headers.add("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(IcUserTemplateEnums.IC_RESI_IMPORT_TEMPLATE.getTemplateName(), "UTF-8"));
 
-            return new ResponseEntity<>(FileUtil.readBytes(icResiImportTemplateFile), headers, HttpStatus.OK);
+            IOUtils.copy(is, os);
         } catch (Exception e) {
             String errorStackTrace = ExceptionUtils.getErrorStackTrace(e);
-
             log.error("下载IC居民信息导入模板失败:{}", errorStackTrace);
 
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下载IC居民信息导入模板失败");
+        } finally {
+            org.apache.poi.util.IOUtils.closeQuietly(is);
+            org.apache.poi.util.IOUtils.closeQuietly(os);
         }
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserImportService.java

@@ -13,7 +13,7 @@ import java.util.List;
   */
 public interface IcResiUserImportService {
 
-    void importIcResiInfoFromExcel(String importTaskId, List<FormItemResult> formItemList, String excelPathName, HttpServletResponse response, Path importTempPath);
+    boolean importIcResiInfoFromExcel(String importTaskId, List<FormItemResult> formItemList, String excelPathName, HttpServletResponse response, Path importTempPath);
 
     /**
      * 创建导入任务

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

@@ -13,7 +13,6 @@ import com.epmet.bean.ResiImportChangedData;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
-import com.epmet.commons.tools.constant.ThreadLocalConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -24,7 +23,6 @@ import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
-import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.commons.tools.utils.Result;
@@ -211,9 +209,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
      * @param formItemList item列表
      * @param excelPathName excel缓存路径
      * @param response 响应对象
+     * @return
      */
     @Override
-    public void importIcResiInfoFromExcel(String importTaskId, List<FormItemResult> formItemList, String excelPathName, HttpServletResponse response, Path importTempPath) {
+    public boolean importIcResiInfoFromExcel(String importTaskId, List<FormItemResult> formItemList, String excelPathName, HttpServletResponse response, Path importTempPath) {
+        boolean isAllSuccess = false;
 
         String app =  EpmetRequestHolder.getHeader(AppClientConstant.APP);
         String client = EpmetRequestHolder.getHeader(AppClientConstant.CLIENT);
@@ -276,6 +276,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 }
                 finishImportTask(importTaskId, loginUserId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,null, resultDescFilePath);
             } else {
+                isAllSuccess = true;
                 finishImportTask(importTaskId, loginUserId, ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,null, null);
             }
 
@@ -298,6 +299,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
             resiCategoryColumnNameAndLabel.remove();
             itemIdAndOptionsCache.invalidateAll();
         }
+
+        return isAllSuccess;
     }
 
     /**