From 3be65b0ff8f02cf76692df23961426c893598988 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Mon, 11 Apr 2022 20:18:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86OfficeXmlFileExcep?=
 =?UTF-8?q?tion=E5=BC=82=E5=B8=B8=E7=9A=84=E5=88=A4=E6=96=AD=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E9=98=B2=E6=9C=89=E7=94=A8=E6=88=B7=E4=B9=B1=E6=94=B9?=
 =?UTF-8?q?=E5=90=8E=E7=BC=80=E5=90=8D=E5=AF=BC=E8=87=B4excel=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/IcResiUserController.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 1f0a127b5f..0bfc2fa442 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -63,6 +63,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -476,8 +477,15 @@ public class IcResiUserController implements ResultDataResolver {
                 String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
                 log.error("【导入居民信息失败】导入失败：{}", errorMsg);
 
+                String resultDesc;
+                if (e instanceof OfficeXmlFileException) {
+                    resultDesc = "文件格式异常，请确保使用下载的模板文件";
+                } else {
+                    resultDesc = "系统异常，请查看系统日志";
+                }
+
                 // 要将导入任务状态设置为结束但不成功。不报错即成功，没有返回值
-                icResiUserImportService.finishImportTask(importTaskId, operatorId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, "系统异常，请查看系统日志", null);
+                icResiUserImportService.finishImportTask(importTaskId, operatorId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, resultDesc, null);
             } finally {
                 try {
                     if (importTempFileSavePath != null){