|
@ -63,6 +63,7 @@ import org.apache.commons.io.FileUtils; |
|
|
import org.apache.commons.io.FilenameUtils; |
|
|
import org.apache.commons.io.FilenameUtils; |
|
|
import org.apache.commons.io.IOUtils; |
|
|
import org.apache.commons.io.IOUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
|
|
import org.apache.poi.poifs.filesystem.OfficeXmlFileException; |
|
|
import org.jetbrains.annotations.NotNull; |
|
|
import org.jetbrains.annotations.NotNull; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.http.HttpHeaders; |
|
|
import org.springframework.http.HttpHeaders; |
|
@ -476,8 +477,15 @@ public class IcResiUserController implements ResultDataResolver { |
|
|
String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); |
|
|
String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); |
|
|
log.error("【导入居民信息失败】导入失败:{}", errorMsg); |
|
|
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 { |
|
|
} finally { |
|
|
try { |
|
|
try { |
|
|
if (importTempFileSavePath != null){ |
|
|
if (importTempFileSavePath != null){ |
|
|