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

clean code

This commit is contained in:
chenxudong 2025-04-16 14:56:35 +08:00
parent 2f1d15240e
commit b634a4396f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,6 @@ import java.nio.charset.Charset;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.*; import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.*;
@ -659,7 +658,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.eq(EdFileInfo::getDataType, EleDataTypeEnum.FILE.code) .eq(EdFileInfo::getDataType, EleDataTypeEnum.FILE.code)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)); .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code));
if (count > 0) { if (count > 0) {
fileName = fileName + "_1"; fileName = fileName + APPEND_NEW_FILE_NAME;
} else { } else {
fileInfo.setFileName(fileName); fileInfo.setFileName(fileName);
return; return;
@ -677,7 +676,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code) .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)); .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code));
if (count > 0) { if (count > 0) {
fileName = fileName + "_1"; fileName = fileName + APPEND_NEW_FILE_NAME;
} else { } else {
fileInfo.setFileName(fileName); fileInfo.setFileName(fileName);
return; return;
@ -1058,7 +1057,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
newEdFileInfo.setParentId(targetFolderId) newEdFileInfo.setParentId(targetFolderId)
.setFileVersion(FILE_START_VERSION) .setFileVersion(FILE_START_VERSION)
.setDataOwn(dataOwnCode) .setDataOwn(dataOwnCode)
.setFileName(srcFileInfo.getFileName() + "_1") .setFileName(srcFileInfo.getFileName() + APPEND_NEW_FILE_NAME)
.setFileCode(commonService.createFileCode(dbPathByDbPath, srcFileInfo.getFileType(), FILE_START_VERSION, newEdFileInfo.getFileTime())) .setFileCode(commonService.createFileCode(dbPathByDbPath, srcFileInfo.getFileType(), FILE_START_VERSION, newEdFileInfo.getFileTime()))
.setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId()); .setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId());
resetFileInfoName(newEdFileInfo); resetFileInfoName(newEdFileInfo);
@ -1228,7 +1227,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
String dbPathByDbPath = commonService.getCodePathByDbPath(destFolderInfo.getFilePath()); String dbPathByDbPath = commonService.getCodePathByDbPath(destFolderInfo.getFilePath());
newEdFileInfo.setParentId(targetFolderId) newEdFileInfo.setParentId(targetFolderId)
.setFileVersion(FILE_START_VERSION) .setFileVersion(FILE_START_VERSION)
.setFileName(srcFileInfo.getFileName() + "_1") .setFileName(srcFileInfo.getFileName() + APPEND_NEW_FILE_NAME)
.setFileCode(commonService.createFileCode(dbPathByDbPath, srcFileInfo.getFileType(), FILE_START_VERSION, newEdFileInfo.getFileTime())) .setFileCode(commonService.createFileCode(dbPathByDbPath, srcFileInfo.getFileType(), FILE_START_VERSION, newEdFileInfo.getFileTime()))
.setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId()); .setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId());
resetFileInfoName(newEdFileInfo); resetFileInfoName(newEdFileInfo);

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileSystemServiceImpl.java
View File

@ -17,7 +17,6 @@ public class FileSystemServiceImpl implements FileSystemService {
} }
/** /**
*
* @param source /user/aaa/bbb.txt * @param source /user/aaa/bbb.txt
* @param destination /user/bbb/aaa.txt * @param destination /user/bbb/aaa.txt
*/ */

2
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/cons/ElectromagneticConstants.java
View File

@ -29,4 +29,6 @@ public interface ElectromagneticConstants {
String EXPORT_PRJ_NAME = "electromagnetic_export"; String EXPORT_PRJ_NAME = "electromagnetic_export";
String USER_ACCESS_LOG = "user_access_log"; String USER_ACCESS_LOG = "user_access_log";
String APPEND_NEW_FILE_NAME = "_1";
} }