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

优化代码

This commit is contained in:
chenxudong 2025-04-17 17:35:20 +08:00
parent 48ca408ef3
commit b13f41f8ed
3 changed files with 10 additions and 15 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/FileBackLogServiceImpl.java
View File

@ -69,7 +69,7 @@ public class FileBackLogServiceImpl extends ServiceImpl<FileBackupLogMapper, Fil
fileBackLogVO.setBackStartTime(DateUtil.date(fileBackupLog.getStartTime())); fileBackLogVO.setBackStartTime(DateUtil.date(fileBackupLog.getStartTime()));
fileBackLogVO.setBackEndTime(DateUtil.date(fileBackupLog.getEndTime())); fileBackLogVO.setBackEndTime(DateUtil.date(fileBackupLog.getEndTime()));
fileBackLogVO.setDataOwn(map.get(fileBackupLog.getFileId()).getDataOwn()); fileBackLogVO.setDataOwn(map.get(fileBackupLog.getFileId()).getDataOwn());
fileBackLogVO.setDataOwner(DataOwnEnum.getTypeByCode(map.get(fileBackupLog.getFileId()).getDataOwn())); fileBackLogVO.setDataOwner(DataOwnEnum.getEnumByCode(map.get(fileBackupLog.getFileId()).getDataOwn()).type);
fileBackLogVO.setFilePath(paths.get(map.get(fileBackupLog.getFileId()).getFilePath())); fileBackLogVO.setFilePath(paths.get(map.get(fileBackupLog.getFileId()).getFilePath()));
list.add(fileBackLogVO); list.add(fileBackLogVO);
} }

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

@ -118,7 +118,7 @@ public class FileRecycleServiceImpl implements FileRecycleService {
Map<String, String> filesPath = commonService.getFilesPath(filePaths); Map<String, String> filesPath = commonService.getFilesPath(filePaths);
Map<String, String> userIdNameMap = getUserIdNameMap(records.stream().map(FileRecycleQueryVO::getUpdatedBy).toList()); Map<String, String> userIdNameMap = getUserIdNameMap(records.stream().map(FileRecycleQueryVO::getUpdatedBy).toList());
records.forEach(e -> { records.forEach(e -> {
e.setDataOwner(DataOwnEnum.getTypeByCode(e.getDataOwn())); e.setDataOwner(DataOwnEnum.getEnumByCode(e.getDataOwn()).type);
e.setFilePrjPath(filesPath.get(e.getFilePath())); e.setFilePrjPath(filesPath.get(e.getFilePath()));
e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize())); e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize()));
e.setUserName(userIdNameMap.get(e.getUpdatedBy())); e.setUserName(userIdNameMap.get(e.getUpdatedBy()));

21
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java
View File

@ -17,11 +17,13 @@ public enum DataOwnEnum {
REPO_FILE(3, "库数据文件（文件夹）", "库数据"); REPO_FILE(3, "库数据文件（文件夹）", "库数据");
private static final Map<Integer, Integer> FILE_PRJ_MAP = new HashMap<>(); private static final Map<Integer, Integer> FILE_PRJ_MAP = new HashMap<>();
private static final Map<Integer, DataOwnEnum> CODE_ENUM = new HashMap<>();
static { static {
FILE_PRJ_MAP.put(DataOwnEnum.SYS_FILE.code, DataOwnEnum.SYS_PRJ.code); FILE_PRJ_MAP.put(DataOwnEnum.SYS_FILE.code, DataOwnEnum.SYS_PRJ.code);
FILE_PRJ_MAP.put(DataOwnEnum.USER_FILE.code, DataOwnEnum.USER_PRJ.code); FILE_PRJ_MAP.put(DataOwnEnum.USER_FILE.code, DataOwnEnum.USER_PRJ.code);
FILE_PRJ_MAP.put(DataOwnEnum.REPO_FILE.code, DataOwnEnum.REPO_PRJ.code); FILE_PRJ_MAP.put(DataOwnEnum.REPO_FILE.code, DataOwnEnum.REPO_PRJ.code);
addEnum();
} }
public final int code; public final int code;
@ -52,21 +54,14 @@ public enum DataOwnEnum {
return code == REPO_FILE.code || code == REPO_PRJ.code; return code == REPO_FILE.code || code == REPO_PRJ.code;
} }
public static String getTypeByCode(int code) { public static DataOwnEnum getEnumByCode(int code) {
for (DataOwnEnum e : DataOwnEnum.values()) { return CODE_ENUM.getOrDefault(code, null);
if (e.code == code) {
return e.type;
}
}
return "";
} }
public static DataOwnEnum getEnumByCode(int code) { private static void addEnum() {
for (DataOwnEnum e : DataOwnEnum.values()) { for (DataOwnEnum value : DataOwnEnum.values()) {
if (e.code == code) { CODE_ENUM.put(value.code, value);
return e;
}
} }
return null;
} }
} }