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-24 09:20:42 +08:00
parent d8fec2ca0b
commit ec77d371c1
2 changed files with 9 additions and 4 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/controller/FileBackupLogController.java
View File

@ -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());
}
}

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

@ -834,7 +834,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
}
private void exportFileTagInfo(String nowTimeStr, List<String> exportFileIds, String userDownloadDataDir) {
List<FileTagRelation> fileTagRelations = fileTagRelationService.getBaseMapper().selectList(Wrappers.lambdaQuery(FileTagRelation.class).in(FileTagRelation::getFileId, exportFileIds));
List<FileTagRelation> 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<EdFileInfoMapper, EdFileI
private void exportFileRelationInfo(String nowTimeStr, List<String> exportFileIds, String userDownloadDataDir) {
List<EdFileRelation> 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<String> exportFileIds, String userDownloadDataDir) {
List<EdFileFavorite> edFileFavorites = fileFavoriteService.getBaseMapper().selectList(Wrappers.lambdaQuery(EdFileFavorite.class).in(EdFileFavorite::getFileId, exportFileIds));
List<EdFileFavorite> 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);