chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改发现的bug

This commit is contained in:
chenxudong 2025-05-09 17:52:26 +08:00
parent 8f61c95cfe
commit 63de8f4d60
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
View File

@ -1580,6 +1580,12 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
} catch (Exception e) { } catch (Exception e) {
ZipUtil.unzip(tmpZipFile, destDir, Charset.forName("GBK")); 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<File> files = FileUtil.loopFiles(destDir);
List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .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()); String fileCode = commonService.createFileCode(edFileInfo.getFilePath(), fileType, FILE_START_VERSION, newEdFileInfo.getFileTime());
newEdFileInfo.setParentId(id) newEdFileInfo.setParentId(id)
.setFileCode(fileCode) .setFileCode(fileCode)
.setSaveStatus(EleDataSaveStatusEnum.UPLOADING.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setDataOwn(DataOwnEnum.SYS_FILE.code) .setDataOwn(DataOwnEnum.SYS_FILE.code)
.setFileName(mainName) .setFileName(importFile.getName())
.setFileContent(EleCommonUtil.parse(file.getInputStream(), suffix)) .setFileContent(EleCommonUtil.parse(FileUtil.getInputStream(importFile), fileType))
.setFileType(suffix) .setFileType(fileType)
.setFileVersion(FILE_START_VERSION) .setFileVersion(FILE_START_VERSION)
.setFileSize(file.getSize()) .setFileSize(file.getSize())
.setFilePath(edFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId()) .setFilePath(edFileInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId())