From ac8277f95958172b3f299029f8181244384237af Mon Sep 17 00:00:00 2001 From: chenxudong Date: Fri, 28 Mar 2025 10:42:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9B=B8=E5=85=B3=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E7=9A=84=E6=97=A5=E5=BF=97=E6=96=B0=E5=A2=9E=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/pojo/resp/FileRecycleQueryVO.java | 2 +- .../serviceimpl/EdFileInfoServiceImpl.java | 26 +++++++++++-------- .../serviceimpl/FileRecycleServiceImpl.java | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java index 5d877b7..0493fd3 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java @@ -33,7 +33,7 @@ public class FileRecycleQueryVO { private String dataOwner; - private int dataOwnCode; + private int dataOwn; private String filePath; 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 ffd5721..508fab2 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 @@ -181,9 +181,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl res = commonService.addFolder(createFolderDTO.getParentId(), createFolderDTO.getNewFolderName(), false, folderId, createFolderDTO.getFileNote(), dataOwnCode); - UserThreadLocal.setSuccessInfo(createFolderDTO.getParentId(), res.getData() + "", "创建文件夹 {} 成功", createFolderDTO.getNewFolderName()); + String dbPath = commonService.getDbPath(this.baseMapper.selectById(createFolderDTO.getParentId()).getFilePath()); + UserThreadLocal.setSuccessInfo(createFolderDTO.getParentId(), res.getData() + "", "创建文件夹 {} 成功，路径为 {}", createFolderDTO.getNewFolderName(), dbPath); return res; } @@ -245,16 +245,17 @@ public class EdFileInfoServiceImpl extends ServiceImpl delete(String id, int dataOwnCode) { EdFileInfo fileInfo = this.baseMapper.selectById(id); + String dbPath = commonService.getDbPath(fileInfo.getFilePath()); if (fileInfo.getDataType() == EleDataTypeEnum.FOLDER.code) { ElectromagneticResult res = commonService.deleteFolder(id, dataOwnCode); - UserThreadLocal.setSuccessInfo(fileInfo.getParentId(), id, "作废目录 {} 成功", fileInfo.getFileName()); + UserThreadLocal.setSuccessInfo(fileInfo.getParentId(), id, "作废目录 {} 成功，路径为 {}", fileInfo.getFileName(), dbPath); return res; } this.baseMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class) .set(EdFileInfo::getEffectFlag, false) .set(EdFileInfo::getAllDeleted, true) .eq(EdFileInfo::getFileId, fileInfo.getFileId())); - UserThreadLocal.setSuccessInfo(fileInfo.getParentId(), id, "作废文件 {}.{} 成功", fileInfo.getFileName(), fileInfo.getFileType()); + UserThreadLocal.setSuccessInfo(fileInfo.getParentId(), id, "作废文件 {}.{} 成功，路径为 {}", fileInfo.getFileName(), fileInfo.getFileType(), dbPath); return ElectromagneticResultUtil.success(true); } @@ -267,10 +268,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl download(String id, HttpServletResponse response, int dataOwnCode) { String fileName = ""; + EdFileInfo fileInfo = this.baseMapper.selectById(id); + String fileSysPath = commonService.getFileSysPath(fileInfo.getFilePath(), dataOwnCode); + String dbPath = commonService.getDbPath(fileInfo.getFilePath()); try { - EdFileInfo fileInfo = this.baseMapper.selectById(id); - String fileSysPath = commonService.getFileSysPath(fileInfo.getFilePath(), dataOwnCode); - Assert.isTrue(FileUtil.exist(fileSysPath), "下载文件不存在。"); + Assert.isTrue(FileUtil.exist(fileSysPath), "下载文件不存在，路径为 {}", dbPath); FileSystemResource fileSystemResource = new FileSystemResource(fileSysPath); fileName = fileSystemResource.getFilename(); HttpHeaders headers = new HttpHeaders(); @@ -279,7 +281,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl filesPath = commonService.getFilesPath(filePaths); Map userIdNameMap = getUserIdNameMap(records.stream().map(FileRecycleQueryVO::getUpdatedBy).collect(Collectors.toList())); records.forEach(e -> { - e.setDataOwner(DataOwnEnum.getTypeByCode(e.getDataOwnCode())); + e.setDataOwner(DataOwnEnum.getTypeByCode(e.getDataOwn())); e.setFilePrjPath(filesPath.get(e.getFilePath())); e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize())); e.setUserName(userIdNameMap.get(e.getUpdatedBy()));