diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileBackupLogController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileBackupLogController.java index cb1e099..909bbf4 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileBackupLogController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileBackupLogController.java @@ -29,6 +29,6 @@ public class FileBackupLogController { @UserOperation(value = "系统恢复", modelName = UserOperationModuleEnum.BACKUP_FILE) public ElectromagneticResult restore() { Long maxEndTime = fileBackLogService.restore(); - return ElectromagneticResultUtil.success(DateUtil.date(maxEndTime)); + return ElectromagneticResultUtil.success(DateUtil.date(maxEndTime).toString()); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index 6adfadf..e681e87 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -839,7 +839,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl exportFileIds, String userDownloadDataDir) { - List fileTagRelations = fileTagRelationService.getBaseMapper().selectList(Wrappers.lambdaQuery(FileTagRelation.class).in(FileTagRelation::getFileId, exportFileIds)); + List fileTagRelations = fileTagRelationService.getBaseMapper().selectList(Wrappers.lambdaQuery(FileTagRelation.class) + .in(FileTagRelation::getFileId, exportFileIds)); String path = userDownloadDataDir + File.separator + EXPORT_PRJ_NAME + "_" + nowTimeStr + File.separator + ED_TAG_RELATIONS + ".json"; String json = JSONUtil.toJsonStr(fileTagRelations); fileSystemService.writeStringToFile(path, json); @@ -855,7 +856,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl exportFileIds, String userDownloadDataDir) { - List edFileFavorites = fileFavoriteService.getBaseMapper().selectList(Wrappers.lambdaQuery(EdFileFavorite.class).in(EdFileFavorite::getFileId, exportFileIds)); + List edFileFavorites = fileFavoriteService.getBaseMapper().selectList(Wrappers.lambdaQuery(EdFileFavorite.class) + .in(EdFileFavorite::getFileId, exportFileIds)); String json = JSONUtil.toJsonStr(edFileFavorites); String path = userDownloadDataDir + File.separator + EXPORT_PRJ_NAME + "_" + nowTimeStr + File.separator + ED_FILE_FAVORITE + ".json"; fileSystemService.writeStringToFile(path, json); diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java index ee5a63a..a98419d 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java @@ -23,7 +23,9 @@ public enum DataOwnEnum { 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.REPO_FILE.code, DataOwnEnum.REPO_PRJ.code); - addEnum(); + for (DataOwnEnum value : DataOwnEnum.values()) { + CODE_ENUM.put(value.code, value); + } } public final int code; @@ -58,10 +60,4 @@ public enum DataOwnEnum { return CODE_ENUM.getOrDefault(code, null); } - private static void addEnum() { - for (DataOwnEnum value : DataOwnEnum.values()) { - CODE_ENUM.put(value.code, value); - } - } - } \ No newline at end of file