From 63de8f4d605fcce9fb068c1a3874cfe48619b4c0 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Fri, 9 May 2025 17:52:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E7=8E=B0=E7=9A=84bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/EdFileInfoServiceImpl.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 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 d598ea8..ef52ce0 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
@@ -1580,6 +1580,12 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         } catch (Exception e) {
             ZipUtil.unzip(tmpZipFile, destDir, Charset.forName("GBK"));
         }
+
+        File file1 = Objects.requireNonNull(new File(destDir).listFiles())[0];
+        if (!StrUtil.equals(file1.getName(), mainName)) {
+            FileUtil.rename(file1, mainName, true);
+        }
+
         List<File> files = FileUtil.loopFiles(destDir);
         List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
@@ -1613,11 +1619,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             String fileCode = commonService.createFileCode(edFileInfo.getFilePath(), fileType, FILE_START_VERSION, newEdFileInfo.getFileTime());
             newEdFileInfo.setParentId(id)
                     .setFileCode(fileCode)
-                    .setSaveStatus(EleDataSaveStatusEnum.UPLOADING.code)
+                    .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
                     .setDataOwn(DataOwnEnum.SYS_FILE.code)
-                    .setFileName(mainName)
-                    .setFileContent(EleCommonUtil.parse(file.getInputStream(), suffix))
-                    .setFileType(suffix)
+                    .setFileName(importFile.getName())
+                    .setFileContent(EleCommonUtil.parse(FileUtil.getInputStream(importFile), fileType))
+                    .setFileType(fileType)
                     .setFileVersion(FILE_START_VERSION)
                     .setFileSize(file.getSize())
                     .setFilePath(edFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId())