From 34708604de7d65c3d5df3338abba2a8889b86661 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 20 Jan 2025 17:58:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=A3=E6=9E=90=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java   | 6 +++---
 .../service/serviceimpl/EdFileRelationServiceImpl.java      | 1 +
 2 files changed, 4 insertions(+), 3 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 8d4eb21..4f94135 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
@@ -730,7 +730,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         newEdFileInfo.newInit();
         // 首先检查是否是同名文件
         try {
-
             Assert.isTrue(EleCommonUtil.isFileNameValid(fileName), NAME_VALID_MSG);
             Long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class)
                     .eq(EdFileInfo::getParentId, parentId)
@@ -749,6 +748,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 newEdFileInfo.setParentId(parentId)
                         .setFileCode(fileCode)
                         .setFileName(mainName)
+                        .setFileContent(EleCommonUtil.parse(file.getInputStream(), suffix))
                         .setFileType(suffix)
                         .setFileVersion(FILE_START_VERSION)
                         .setFileSize(file.getSize())
@@ -1082,10 +1082,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .setFileCode(fileCode)
                     .setFileName(mainName)
                     .setFileType(suffix)
-                    .setFileContent("")
                     .setFileVersion(maxFileVersion + 1)
                     .setPreVersion(maxFileVersion)
-                    .setFileNote("")
+                    .setFileContent(EleCommonUtil.parse(file.getInputStream(), suffix))
                     .setFileTime(timeStr)
                     .setFileSize(file.getSize())
                     .setFilePath(parentFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId())
@@ -1111,6 +1110,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .setFileCode(fileCode)
                     .setFileName(mainName)
                     .setFileType(suffix)
+                    .setFileContent(EleCommonUtil.parse(file.getInputStream(), suffix))
                     .setFileVersion(FILE_START_VERSION)
                     .setFileTime(newEdFileInfo.getFileTime())
                     .setFileSize(file.getSize())
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
index 050fdce..b3589d6 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
@@ -217,6 +217,7 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
                         .setFileCode(fileCode)
                         .setFileName(mainName)
                         .setFileType(suffix)
+                        .setFileContent(EleCommonUtil.parse(file.getInputStream(), suffix))
                         .setFileVersion(FILE_START_VERSION)
                         .setFileSize(file.getSize())
                         .setFilePath(parentFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId())