diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileBackLogVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileBackLogVO.java index 92865d0..0f9f1b9 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileBackLogVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileBackLogVO.java @@ -24,4 +24,9 @@ public class FileBackLogVO { private boolean backupSuccess; + private Integer dataOwn; + + private String dataOwner; + + private String filePath; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java index 646f34e..12ea1d0 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java @@ -29,6 +29,8 @@ import javax.annotation.Resource; import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Slf4j @Service @@ -53,14 +55,24 @@ public class FileBackLogServiceImpl extends ServiceImpl(0L, records)); } + List fileIds = records.stream().map(FileBackupLog::getFileId).collect(Collectors.toList()); + List edFileInfos = edFileInfoMapper.selectList(Wrappers.lambdaQuery() + .select(EdFileInfo.class, file -> !StrUtil.equals(file.getColumn(), "file_content")) + .in(EdFileInfo::getId, fileIds)); + Map map = edFileInfos.stream().collect(Collectors.toMap(EdFileInfo::getId, e -> e)); + Map paths = commonService.getFilesPath(edFileInfos.stream().map(EdFileInfo::getFilePath).collect(Collectors.toList())); long total = fileBackupLogPage.getTotal(); List list = new ArrayList<>(); for (FileBackupLog fileBackupLog : records) { FileBackLogVO fileBackLogVO = BeanUtil.copyProperties(fileBackupLog, FileBackLogVO.class); fileBackLogVO.setBackStartTime(DateUtil.date(fileBackupLog.getStartTime())); fileBackLogVO.setBackEndTime(DateUtil.date(fileBackupLog.getEndTime())); + fileBackLogVO.setDataOwn(map.get(fileBackupLog.getFileId()).getDataOwn()); + fileBackLogVO.setDataOwner(DataOwnEnum.getTypeByCode(map.get(fileBackupLog.getFileId()).getDataOwn())); + fileBackLogVO.setFilePath(paths.get(map.get(fileBackupLog.getFileId()).getFilePath())); list.add(fileBackLogVO); } + UserThreadLocal.setSuccessInfo("", "", "查询备份日志成功"); return ElectromagneticResultUtil.success(new RespPageVO<>(total, list)); }