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

优化代码。

This commit is contained in:
chenxudong 2025-03-07 13:46:44 +08:00
parent eac95e140f
commit 83ff46efc3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
View File

@ -173,7 +173,7 @@ public class CommonService {
} }
public String createFileCode(String parentId, String fileType, int version, String timeStr) { public String createFileCode(String parentId, String fileType, int version, String timeStr) {
if (fileType.equals(EleDataTypeEnum.FOLDER.desc)) { if (fileType.equals(EleDataTypeEnum.FOLDER.desc) || StrUtil.isEmpty(fileType)) {
return parentId + "00" + version + timeStr; return parentId + "00" + version + timeStr;
} }
FileFormat fileFormat = fileFormatService.getBaseMapper().selectOne(Wrappers.lambdaQuery(FileFormat.class).eq(FileFormat::getSuffixName, fileType)); FileFormat fileFormat = fileFormatService.getBaseMapper().selectOne(Wrappers.lambdaQuery(FileFormat.class).eq(FileFormat::getSuffixName, fileType));

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

@ -1109,7 +1109,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
String destFilePath = commonService.getFileSysPath(destSaveFileInfo.getFilePath(), dataOwnCode); String destFilePath = commonService.getFileSysPath(destSaveFileInfo.getFilePath(), dataOwnCode);
fileSystemService.copyFile(srcFilePath, destFilePath); fileSystemService.copyFile(srcFilePath, destFilePath);
return destSaveFileInfo; return destSaveFileInfo;
} else if (strategy == FileRepeatEnum.NEW.code) { } else {
// 文件名加“_1”，版本号从100开始 // 文件名加“_1”，版本号从100开始
// 处理MySQL相关逻辑 // 处理MySQL相关逻辑
EdFileInfo newEdFileInfo = BeanUtil.copyProperties(srcFileInfo, EdFileInfo.class); EdFileInfo newEdFileInfo = BeanUtil.copyProperties(srcFileInfo, EdFileInfo.class);
@ -1128,7 +1128,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
fileSystemService.copyFile(srcFileSysPath, destFileSysPath); fileSystemService.copyFile(srcFileSysPath, destFileSysPath);
return newEdFileInfo; return newEdFileInfo;
} }
return null;
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)