ak/file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复解压失败问题

Browse Source
This commit is contained in:
马超 2020-10-29 13:45:20 +08:00
parent ca84556d53
commit 54a3fcec64
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
file-web/src/main/java/com/qiwenshare/file/api/IFileService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
public interface IFileService extends IService<FileBean> { public interface IFileService extends IService<FileBean> {
void insertFile(FileBean fileBean); void insertFile(FileBean fileBean);
void batchInsertFile(List<FileBean> fileBeanList); void batchInsertFile(List<FileBean> fileBeanList, Long userId);
void updateFile(FileBean fileBean); void updateFile(FileBean fileBean);
List<FileBean> selectFileByNameAndPath(FileBean fileBean); List<FileBean> selectFileByNameAndPath(FileBean fileBean);
FileBean selectFileById(FileBean fileBean); FileBean selectFileById(FileBean fileBean);

21
file-web/src/main/java/com/qiwenshare/file/controller/FileController.java
View File

@ -89,15 +89,16 @@ public class FileController {
if (1 == fileBean.getIsDir()) { if (1 == fileBean.getIsDir()) {
fileBean.setOldFilePath(fileBean.getFilePath() + fileBean.getOldFileName() + "/"); fileBean.setOldFilePath(fileBean.getFilePath() + fileBean.getOldFileName() + "/");
fileBean.setFilePath(fileBean.getFilePath() + fileBean.getFileName() + "/"); fileBean.setFilePath(fileBean.getFilePath() + fileBean.getFileName() + "/");
} } else {
if (fileBean.getIsOSS() == 1) { if (fileBean.getIsOSS() == 1) {
FileBean file = fileService.getById(fileBean.getFileId()); FileBean file = fileService.getById(fileBean.getFileId());
String fileUrl = file.getFileUrl(); String fileUrl = file.getFileUrl();
String newFileUrl = fileUrl.replace(file.getFileName(), fileBean.getFileName()); String newFileUrl = fileUrl.replace(file.getFileName(), fileBean.getFileName());
fileBean.setFileUrl(newFileUrl); fileBean.setFileUrl(newFileUrl);
AliyunOSSRename.rename(qiwenFileConfig.getAliyun().getOss(), AliyunOSSRename.rename(qiwenFileConfig.getAliyun().getOss(),
fileUrl.substring(1), fileUrl.substring(1),
newFileUrl.substring(1)); newFileUrl.substring(1));
}
} }
fileService.updateFile(fileBean); fileService.updateFile(fileBean);
restResult.setSuccess(true); restResult.setSuccess(true);
@ -241,7 +242,7 @@ public class FileController {
} }
fileBeanList.add(tempFileBean); fileBeanList.add(tempFileBean);
} }
fileService.batchInsertFile(fileBeanList); fileService.batchInsertFile(fileBeanList, sessionUserBean.getUserId());
result.setSuccess(true); result.setSuccess(true);
return result; return result;

6
file-web/src/main/java/com/qiwenshare/file/service/FileService.java
View File

@ -36,9 +36,9 @@ public class FileService extends ServiceImpl<FileMapper, FileBean> implements IF
} }
@Override @Override
public void batchInsertFile(List<FileBean> fileBeanList) { public void batchInsertFile(List<FileBean> fileBeanList, Long userId) {
UserBean sessionUserBean = (UserBean) SecurityUtils.getSubject().getPrincipal(); // UserBean sessionUserBean = (UserBean) SecurityUtils.getSubject().getPrincipal();
StorageBean storageBean = filetransferService.selectStorageBean(new StorageBean(sessionUserBean.getUserId())); StorageBean storageBean = filetransferService.selectStorageBean(new StorageBean(userId));
long fileSizeSum = 0; long fileSizeSum = 0;
for (FileBean fileBean : fileBeanList) { for (FileBean fileBean : fileBeanList) {
if (fileBean.getIsDir() == 0) { if (fileBean.getIsDir() == 0) {