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 54e3f22..79813ff 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 @@ -11,8 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @RestController @RequestMapping("/data/ed/backup/") public class FileBackupLogController { @@ -29,7 +27,7 @@ public class FileBackupLogController { @GetMapping(value = "restore") @UserOperation(value = "系统恢复", modelName = UserOperationModuleEnum.BACKUP_FILE) public ElectromagneticResult restore() { - List restorePaths = fileBackLogService.restore(); - return ElectromagneticResultUtil.success(restorePaths); + Long maxEndTime = fileBackLogService.restore(); + return ElectromagneticResultUtil.success(maxEndTime); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/FileBackLogService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/FileBackLogService.java index e712056..9c3aef7 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/FileBackLogService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/FileBackLogService.java @@ -2,11 +2,9 @@ package com.electromagnetic.industry.software.manage.service; import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; -import java.util.List; - public interface FileBackLogService { ElectromagneticResult query(Integer pageNumber, Integer pageSize); - List restore(); + Long restore(); } 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 074f310..db8b816 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 @@ -1115,7 +1115,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl())); } - lambdaQuery.or(qr -> { for (String id : list) { qr.likeRight(EdFileInfo::getFileCode, id); @@ -1253,7 +1252,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl restore() { + public Long restore() { List edFileInfos = edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) .select(EdFileInfo.class, file -> !StrUtil.equals(file.getColumn(), "file_content")) .eq(EdFileInfo::getPermanentDeleted, false) .eq(EdFileInfo::getDataType, EleDataTypeEnum.FILE.code)); - List restoreFilePaths = new ArrayList<>(); for (EdFileInfo edFileInfo : edFileInfos) { String destPath = EleCommonUtil.simpleTrueFalse(DataOwnEnum.isUserCode(edFileInfo.getDataOwn()), @@ -97,11 +94,15 @@ public class FileBackLogServiceImpl extends ServiceImpl fileBackupLogs = this.baseMapper.selectList(Wrappers.lambdaQuery().orderByDesc(FileBackupLog::getEndTime).last(" limit 1")); + if (CollUtil.isEmpty(fileBackupLogs)) { + return 0L; + } + Long endTime = fileBackupLogs.get(0).getEndTime(); + UserThreadLocal.setSuccessInfo("", "", "数据库恢复成功,最新时间戳为 {}", endTime); + return endTime; } }