From e27c3d9c65f9302bf0e9476cb8844843a2388e05 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Thu, 17 Apr 2025 15:56:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/EdFileInfoServiceImpl.java      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index cdc2b50..a3ffcb7 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -465,18 +465,19 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 OutputStream outputStream = Files.newOutputStream(Paths.get(zipDirPath))
         ) {
             aes.decrypt(inputStream, outputStream, true);
+            String uuid = IdUtil.fastSimpleUUID();
+            String tmpDir = elePropertyConfig.getUploadDataDir(dataOwnCode) + currentUserId + File.separator + uuid + File.separator;
+            ZipUtil.unzip(zipDirPath, tmpDir);
+            update2Database(tmpDir, dataOwnCode);
+            UserThreadLocal.setSuccessInfo("", "", "导入数据库成功，文件名称为 " + mainName);
+            return ElectromagneticResultUtil.success(true);
         } catch (Exception e) {
             String info = "文件上传错误";
             log.error(info, e);
             throw new BizException(info);
+        } finally {
+            fileSystemService.deleteFile(zipDirPath, destColibPath);
         }
-        String uuid = IdUtil.fastSimpleUUID();
-        String tmpDir = elePropertyConfig.getUploadDataDir(dataOwnCode) + currentUserId + File.separator + uuid + File.separator;
-        ZipUtil.unzip(zipDirPath, tmpDir);
-        update2Database(tmpDir, dataOwnCode);
-        fileSystemService.deleteFile(zipDirPath, destColibPath);
-        UserThreadLocal.setSuccessInfo("", "", "导入数据库成功，文件名称为 " + mainName);
-        return ElectromagneticResultUtil.success(true);
     }
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
@@ -682,7 +683,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     String id = saveObj.getId();
                     String preVersionId = dbVersionRelation.get(id);
                     EdFileInfo tmp = importIdMap.get(preVersionId);
-                    saveObj.setPreVersion(ObjUtil.isNull(tmp) ? null : tmp.getFileVersion());
+                    saveObj.setPreVersion(Optional.ofNullable(tmp).map(EdFileInfo::getFileVersion).orElse(null));
                     int effect = ObjUtil.equals(saveObj.getId(), effectId) ? EffectFlagEnum.EFFECT.code : EffectFlagEnum.NOT_EFFECTIVE.code;
                     saveObj.setEffectFlag(effect);
                 }