修改发现的bug
This commit is contained in:
parent
8f61c95cfe
commit
63de8f4d60
|
|
@ -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())
|
||||
|
|
|
|||
Loading…
Reference in New Issue