diff --git a/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java b/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java index c785de8..6654db4 100644 --- a/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java +++ b/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java @@ -9,7 +9,7 @@ import java.util.List; public interface IFileService extends IService { void insertFile(FileBean fileBean); - void batchInsertFile(List fileBeanList); + void batchInsertFile(List fileBeanList, Long userId); void updateFile(FileBean fileBean); List selectFileByNameAndPath(FileBean fileBean); FileBean selectFileById(FileBean fileBean); diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java index d3bacb0..58f69df 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java @@ -89,15 +89,16 @@ public class FileController { if (1 == fileBean.getIsDir()) { fileBean.setOldFilePath(fileBean.getFilePath() + fileBean.getOldFileName() + "/"); fileBean.setFilePath(fileBean.getFilePath() + fileBean.getFileName() + "/"); - } - if (fileBean.getIsOSS() == 1) { - FileBean file = fileService.getById(fileBean.getFileId()); - String fileUrl = file.getFileUrl(); - String newFileUrl = fileUrl.replace(file.getFileName(), fileBean.getFileName()); - fileBean.setFileUrl(newFileUrl); - AliyunOSSRename.rename(qiwenFileConfig.getAliyun().getOss(), - fileUrl.substring(1), - newFileUrl.substring(1)); + } else { + if (fileBean.getIsOSS() == 1) { + FileBean file = fileService.getById(fileBean.getFileId()); + String fileUrl = file.getFileUrl(); + String newFileUrl = fileUrl.replace(file.getFileName(), fileBean.getFileName()); + fileBean.setFileUrl(newFileUrl); + AliyunOSSRename.rename(qiwenFileConfig.getAliyun().getOss(), + fileUrl.substring(1), + newFileUrl.substring(1)); + } } fileService.updateFile(fileBean); restResult.setSuccess(true); @@ -241,7 +242,7 @@ public class FileController { } fileBeanList.add(tempFileBean); } - fileService.batchInsertFile(fileBeanList); + fileService.batchInsertFile(fileBeanList, sessionUserBean.getUserId()); result.setSuccess(true); return result; diff --git a/file-web/src/main/java/com/qiwenshare/file/service/FileService.java b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java index 3868648..f849829 100644 --- a/file-web/src/main/java/com/qiwenshare/file/service/FileService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java @@ -36,9 +36,9 @@ public class FileService extends ServiceImpl implements IF } @Override - public void batchInsertFile(List fileBeanList) { - UserBean sessionUserBean = (UserBean) SecurityUtils.getSubject().getPrincipal(); - StorageBean storageBean = filetransferService.selectStorageBean(new StorageBean(sessionUserBean.getUserId())); + public void batchInsertFile(List fileBeanList, Long userId) { +// UserBean sessionUserBean = (UserBean) SecurityUtils.getSubject().getPrincipal(); + StorageBean storageBean = filetransferService.selectStorageBean(new StorageBean(userId)); long fileSizeSum = 0; for (FileBean fileBean : fileBeanList) { if (fileBean.getIsDir() == 0) {