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);