From ec77d371c17b5db9f85ae76ff7c51345b46856ff Mon Sep 17 00:00:00 2001 From: chenxudong Date: Thu, 24 Apr 2025 09:20:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=EF=BC=8C=E6=A0=87=E7=AD=BE=E5=92=8C=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=9C=89=E6=95=88=E6=80=A7?= =?UTF-8?q?=E7=9A=84=E7=AD=9B=E9=80=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/FileBackupLogController.java | 2 +- .../service/serviceimpl/EdFileInfoServiceImpl.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) 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 42f0053..607ed65 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 @@ -834,7 +834,9 @@ 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) + .eq(FileTagRelation::getEffectFlag, EffectFlagEnum.EFFECT.code)); String path = userDownloadDataDir + File.separator + EXPORT_PRJ_NAME + "_" + nowTimeStr + File.separator + ED_TAG_RELATIONS + ".json"; String json = JSONUtil.toJsonStr(fileTagRelations); fileSystemService.writeStringToFile(path, json); @@ -843,14 +845,17 @@ public class EdFileInfoServiceImpl extends ServiceImpl exportFileIds, String userDownloadDataDir) { List edFileRelations = edFileRelationService.getBaseMapper().selectList(Wrappers.lambdaQuery(EdFileRelation.class).in(EdFileRelation::getId1, exportFileIds) .or() - .in(EdFileRelation::getId2, exportFileIds)); + .in(EdFileRelation::getId2, exportFileIds) + .eq(EdFileRelation::getEffectFlag, EffectFlagEnum.EFFECT.code)); String json = JSONUtil.toJsonStr(edFileRelations); String path = userDownloadDataDir + File.separator + EXPORT_PRJ_NAME + "_" + nowTimeStr + File.separator + ED_FILE_RELATION + ".json"; fileSystemService.writeStringToFile(path, json); } private void exportCollectionInfo(String nowTimeStr, List 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) + .eq(EdFileFavorite::getEffectFlag, EffectFlagEnum.EFFECT.code)); String json = JSONUtil.toJsonStr(edFileFavorites); String path = userDownloadDataDir + File.separator + EXPORT_PRJ_NAME + "_" + nowTimeStr + File.separator + ED_FILE_FAVORITE + ".json"; fileSystemService.writeStringToFile(path, json); From c0c07202a276678241837c2a477ef025fdb32602 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Thu, 24 Apr 2025 09:34:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=97=B6=E6=A0=B9=E6=8D=AE=E6=96=87=E4=BB=B6=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=80=A7=E5=81=9A=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/serviceimpl/EdFileInfoServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 607ed65..e0aa082 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 @@ -835,8 +835,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl exportFileIds, String userDownloadDataDir) { List fileTagRelations = fileTagRelationService.getBaseMapper().selectList(Wrappers.lambdaQuery(FileTagRelation.class) - .in(FileTagRelation::getFileId, exportFileIds) - .eq(FileTagRelation::getEffectFlag, EffectFlagEnum.EFFECT.code)); + .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); @@ -845,8 +844,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl exportFileIds, String userDownloadDataDir) { List edFileRelations = edFileRelationService.getBaseMapper().selectList(Wrappers.lambdaQuery(EdFileRelation.class).in(EdFileRelation::getId1, exportFileIds) .or() - .in(EdFileRelation::getId2, exportFileIds) - .eq(EdFileRelation::getEffectFlag, EffectFlagEnum.EFFECT.code)); + .in(EdFileRelation::getId2, exportFileIds)); String json = JSONUtil.toJsonStr(edFileRelations); String path = userDownloadDataDir + File.separator + EXPORT_PRJ_NAME + "_" + nowTimeStr + File.separator + ED_FILE_RELATION + ".json"; fileSystemService.writeStringToFile(path, json); @@ -854,8 +852,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl exportFileIds, String userDownloadDataDir) { List edFileFavorites = fileFavoriteService.getBaseMapper().selectList(Wrappers.lambdaQuery(EdFileFavorite.class) - .in(EdFileFavorite::getFileId, exportFileIds) - .eq(EdFileFavorite::getEffectFlag, EffectFlagEnum.EFFECT.code)); + .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); From 80c36386317174da0694d902c6619cd85bb496ed Mon Sep 17 00:00:00 2001 From: chenxudong Date: Thu, 24 Apr 2025 11:45:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../industry/software/common/enums/DataOwnEnum.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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