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

fix(文件下载): 文件打包下载内容为空修复

Browse Source
This commit is contained in:
MAC 2022-04-30 23:59:30 +08:00
parent 18d0eaff5c
commit f2d40a8c31
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/qiwenshare/file/api/IUserFileService.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.qiwenshare.file.domain.UserFile; import com.qiwenshare.file.domain.UserFile;
import com.qiwenshare.file.vo.file.FileListVo; import com.qiwenshare.file.vo.file.FileListVo;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -17,8 +18,9 @@ public interface IUserFileService extends IService<UserFile> {
IPage<FileListVo> getFileByFileType(Integer fileTypeId, Long currentPage, Long pageCount, long userId); IPage<FileListVo> getFileByFileType(Integer fileTypeId, Long currentPage, Long pageCount, long userId);
List<UserFile> selectUserFileListByPath(String filePath, Long userId); List<UserFile> selectUserFileListByPath(String filePath, Long userId);
List<UserFile> selectFileListLikeRightFilePath(String filePath, long userId);
List<UserFile> selectFilePathTreeByUserId(Long userId); List<UserFile> selectFilePathTreeByUserId(Long userId);
void deleteUserFile(String userFileId, Long sessionUserId); void deleteUserFile(String userFileId, Long sessionUserId);
List<UserFile> selectUserFileByLikeRightFilePath(@Param("filePath") String filePath, @Param("userId") long userId);
} }

5
src/main/java/com/qiwenshare/file/controller/FileController.java
View File

@ -166,10 +166,11 @@ public class FileController {
.eq(UserFile::getUserFileId, renameFileDto.getUserFileId()); .eq(UserFile::getUserFileId, renameFileDto.getUserFileId());
userFileService.update(lambdaUpdateWrapper); userFileService.update(lambdaUpdateWrapper);
if (1 == userFile.getIsDir()) { if (1 == userFile.getIsDir()) {
List<UserFile> list = userFileService.selectFileListLikeRightFilePath(userFile.getFilePath() + userFile.getFileName() + "/", sessionUserBean.getUserId()); List<UserFile> list = userFileService.selectUserFileByLikeRightFilePath(new QiwenFile(userFile.getFilePath(), userFile.getFileName(), true).getPath(), sessionUserBean.getUserId());
for (UserFile newUserFile : list) { for (UserFile newUserFile : list) {
newUserFile.setFilePath(newUserFile.getFilePath().replaceFirst(userFile.getFilePath() + userFile.getFileName() + "/", userFile.getFilePath() + renameFileDto.getFileName() + "/")); newUserFile.setFilePath(newUserFile.getFilePath().replaceFirst(new QiwenFile(userFile.getFilePath(), userFile.getFileName(), userFile.getIsDir() == 1).getPath(),
new QiwenFile(userFile.getFilePath(), renameFileDto.getFileName(), userFile.getIsDir() == 1).getPath()));
userFileService.updateById(newUserFile); userFileService.updateById(newUserFile);
} }
} }

7
src/main/java/com/qiwenshare/file/controller/FiletransferController.java
View File

@ -155,11 +155,8 @@ public class FiletransferController {
if (userFile.getIsDir() == 0) { if (userFile.getIsDir() == 0) {
userFileIds.add(userFileId); userFileIds.add(userFileId);
} else { } else {
LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>(); QiwenFile qiwenFile = new QiwenFile(userFile.getFilePath(), userFile.getFileName(), true);
lambdaQueryWrapper.likeRight(UserFile::getFilePath, userFile.getFilePath() + QiwenFile.separator + userFile.getFileName()) List<UserFile> userFileList = userFileService.selectUserFileByLikeRightFilePath(qiwenFile.getPath(), userFile.getUserId());
.eq(UserFile::getUserId, userFile.getUserId())
.eq(UserFile::getDeleteFlag, 0);
List<UserFile> userFileList = userFileService.list(lambdaQueryWrapper);
List<String> userFileIds1 = userFileList.stream().map(UserFile::getUserFileId).collect(Collectors.toList()); List<String> userFileIds1 = userFileList.stream().map(UserFile::getUserFileId).collect(Collectors.toList());
userFileIds.add(userFile.getUserFileId()); userFileIds.add(userFile.getUserFileId());
userFileIds.addAll(userFileIds1); userFileIds.addAll(userFileIds1);

4
src/main/java/com/qiwenshare/file/controller/ShareController.java
View File

@ -81,7 +81,7 @@ public class ShareController {
} }
if (userFile.getIsDir() == 1) { if (userFile.getIsDir() == 1) {
QiwenFile qiwenFile = new QiwenFile(userFile.getFilePath(), userFile.getFileName(), true); QiwenFile qiwenFile = new QiwenFile(userFile.getFilePath(), userFile.getFileName(), true);
List<UserFile> userfileList = userFileService.selectFileListLikeRightFilePath(qiwenFile.getPath(), sessionUserBean.getUserId()); List<UserFile> userfileList = userFileService.selectUserFileByLikeRightFilePath(qiwenFile.getPath(), sessionUserBean.getUserId());
for (UserFile userFile1 : userfileList) { for (UserFile userFile1 : userfileList) {
ShareFile shareFile1 = new ShareFile(); ShareFile shareFile1 = new ShareFile();
shareFile1.setUserFileId(userFile1.getUserFileId()); shareFile1.setUserFileId(userFile1.getUserFileId());
@ -121,7 +121,7 @@ public class ShareController {
String savefileName = fileDealComp.getRepeatFileName(userFile, savefilePath); String savefileName = fileDealComp.getRepeatFileName(userFile, savefilePath);
if (userFile.getIsDir() == 1) { if (userFile.getIsDir() == 1) {
List<UserFile> userfileList = userFileService.selectFileListLikeRightFilePath(userFile.getFilePath() + userFile.getFileName(), userFile.getUserId()); List<UserFile> userfileList = userFileService.selectUserFileByLikeRightFilePath(new QiwenFile(userFile.getFilePath(), userFile.getFileName(), true).getPath(), userFile.getUserId());
log.info("查询文件列表：" + JSON.toJSONString(userfileList)); log.info("查询文件列表：" + JSON.toJSONString(userfileList));
String filePath = userFile.getFilePath(); String filePath = userFile.getFilePath();
userfileList.forEach(p->{ userfileList.forEach(p->{

4
src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java
View File

@ -7,6 +7,8 @@ import com.qiwenshare.file.domain.UserFile;
import com.qiwenshare.file.vo.file.FileListVo; import com.qiwenshare.file.vo.file.FileListVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface UserFileMapper extends BaseMapper<UserFile> { public interface UserFileMapper extends BaseMapper<UserFile> {
void updateFilepathByPathAndName(String oldfilePath, String newfilePath, String fileName, String extendName, long userId); void updateFilepathByPathAndName(String oldfilePath, String newfilePath, String fileName, String extendName, long userId);
@ -22,6 +24,8 @@ public interface UserFileMapper extends BaseMapper<UserFile> {
@Param("newFilePath") String newfilePath, @Param("newFilePath") String newfilePath,
@Param("userId") long userId); @Param("userId") long userId);
List<UserFile> selectUserFileByLikeRightFilePath(@Param("filePath") String filePath, @Param("userId") long userId);
IPage<FileListVo> selectPageVo(Page<?> page, @Param("userFile") UserFile userFile, @Param("fileTypeId") Integer fileTypeId); IPage<FileListVo> selectPageVo(Page<?> page, @Param("userFile") UserFile userFile, @Param("fileTypeId") Integer fileTypeId);
Long selectStorageSizeByUserId(@Param("userId") Long userId); Long selectStorageSizeByUserId(@Param("userId") Long userId);
} }

6
src/main/java/com/qiwenshare/file/service/FiletransferService.java
View File

@ -411,7 +411,8 @@ public class FiletransferService implements IFiletransferService {
InputStream inputStream = downloader.getInputStream(downloadFile); InputStream inputStream = downloader.getInputStream(downloadFile);
BufferedInputStream bis = new BufferedInputStream(inputStream); BufferedInputStream bis = new BufferedInputStream(inputStream);
try { try {
zos.putNextEntry(new ZipEntry(userFile1.getFilePath().replaceFirst(filePath, "") + "/" + userFile1.getFileName() + "." + userFile1.getExtendName())); QiwenFile qiwenFile = new QiwenFile(userFile1.getFilePath().replaceFirst(filePath, ""), userFile1.getFileName() + "." + userFile1.getExtendName(), false);
zos.putNextEntry(new ZipEntry(qiwenFile.getPath()));
byte[] buffer = new byte[1024]; byte[] buffer = new byte[1024];
int i = bis.read(buffer); int i = bis.read(buffer);
@ -431,8 +432,9 @@ public class FiletransferService implements IFiletransferService {
} }
} }
} else { } else {
QiwenFile qiwenFile = new QiwenFile(userFile1.getFilePath(), userFile1.getFileName(), true);
// 空文件夹的处理 // 空文件夹的处理
zos.putNextEntry(new ZipEntry(userFile1.getFilePath() + userFile1.getFileName() + "/")); zos.putNextEntry(new ZipEntry(qiwenFile.getPath() + QiwenFile.separator));
// 没有文件，不需要文件的copy // 没有文件，不需要文件的copy
zos.closeEntry(); zos.closeEntry();
} }

37
src/main/java/com/qiwenshare/file/service/UserFileService.java
View File

@ -15,6 +15,7 @@ import com.qiwenshare.common.util.security.SessionUtil;
import com.qiwenshare.file.api.IUserFileService; import com.qiwenshare.file.api.IUserFileService;
import com.qiwenshare.file.domain.RecoveryFile; import com.qiwenshare.file.domain.RecoveryFile;
import com.qiwenshare.file.domain.UserFile; import com.qiwenshare.file.domain.UserFile;
import com.qiwenshare.file.io.QiwenFile;
import com.qiwenshare.file.mapper.FileMapper; import com.qiwenshare.file.mapper.FileMapper;
import com.qiwenshare.file.mapper.FileTypeMapper; import com.qiwenshare.file.mapper.FileTypeMapper;
import com.qiwenshare.file.mapper.RecoveryFileMapper; import com.qiwenshare.file.mapper.RecoveryFileMapper;
@ -100,11 +101,11 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
userFileMapper.updateFilepathByPathAndName(oldfilePath, newfilePath, fileName, extendName, userId); userFileMapper.updateFilepathByPathAndName(oldfilePath, newfilePath, fileName, extendName, userId);
//移动子目录 //移动子目录
oldfilePath = oldfilePath + "/" + fileName; oldfilePath = new QiwenFile(oldfilePath, fileName, true).getPath();
newfilePath = newfilePath + "/" + fileName; newfilePath = new QiwenFile(newfilePath, fileName, true).getPath();
if (StringUtils.isEmpty(extendName)) { //为空说明是目录，则需要移动子目录 if (StringUtils.isEmpty(extendName)) { //为空说明是目录，则需要移动子目录
List<UserFile> list = selectFileListLikeRightFilePath(oldfilePath, userId); List<UserFile> list = selectUserFileByLikeRightFilePath(oldfilePath, userId);
for (UserFile newUserFile : list) { for (UserFile newUserFile : list) {
newUserFile.setFilePath(newUserFile.getFilePath().replaceFirst(oldfilePath, newfilePath)); newUserFile.setFilePath(newUserFile.getFilePath().replaceFirst(oldfilePath, newfilePath));
@ -127,8 +128,8 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
//移动子目录 //移动子目录
oldfilePath = oldfilePath + "/" + fileName; oldfilePath = new QiwenFile(oldfilePath, fileName, true).getPath();
newfilePath = newfilePath + "/" + fileName; newfilePath = new QiwenFile(newfilePath, fileName, true).getPath();
oldfilePath = oldfilePath.replace("\\", "\\\\\\\\"); oldfilePath = oldfilePath.replace("\\", "\\\\\\\\");
oldfilePath = oldfilePath.replace("'", "\\'"); oldfilePath = oldfilePath.replace("'", "\\'");
@ -161,23 +162,6 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
return userFileMapper.selectList(lambdaQueryWrapper); return userFileMapper.selectList(lambdaQueryWrapper);
} }
@Override
public List<UserFile> selectFileListLikeRightFilePath(String filePath, long userId) {
filePath = filePath.replace("\\", "\\\\\\\\");
filePath = filePath.replace("'", "\\'");
filePath = filePath.replace("%", "\\%");
filePath = filePath.replace("_", "\\_");
LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
log.info("查询文件路径：" + filePath);
lambdaQueryWrapper.eq(UserFile::getUserId, userId)
.likeRight(UserFile::getFilePath, filePath)
.eq(UserFile::getDeleteFlag, 0);
return userFileMapper.selectList(lambdaQueryWrapper);
}
@Override @Override
public List<UserFile> selectFilePathTreeByUserId(Long userId) { public List<UserFile> selectFilePathTreeByUserId(Long userId) {
LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@ -200,7 +184,7 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
.eq(UserFile::getUserFileId, userFileId); .eq(UserFile::getUserFileId, userFileId);
userFileMapper.update(null, userFileLambdaUpdateWrapper); userFileMapper.update(null, userFileLambdaUpdateWrapper);
String filePath = userFile.getFilePath() + "/" + userFile.getFileName(); String filePath = new QiwenFile(userFile.getFilePath(), userFile.getFileName(), true).getPath();
updateFileDeleteStateByFilePath(filePath, uuid, sessionUserId); updateFileDeleteStateByFilePath(filePath, uuid, sessionUserId);
}else{ }else{
@ -222,9 +206,14 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
} }
@Override
public List<UserFile> selectUserFileByLikeRightFilePath(String filePath, long userId) {
return userFileMapper.selectUserFileByLikeRightFilePath(filePath, userId);
}
private void updateFileDeleteStateByFilePath(String filePath, String deleteBatchNum, Long userId) { private void updateFileDeleteStateByFilePath(String filePath, String deleteBatchNum, Long userId) {
executor.execute(() -> { executor.execute(() -> {
List<UserFile> fileList = selectFileListLikeRightFilePath(filePath, userId); List<UserFile> fileList = selectUserFileByLikeRightFilePath(filePath, userId);
for (int i = 0; i < fileList.size(); i++){ for (int i = 0; i < fileList.size(); i++){
UserFile userFileTemp = fileList.get(i); UserFile userFileTemp = fileList.get(i);
//标记删除标志 //标记删除标志

5
src/main/resources/mapper/UserFileMapper.xml
View File

@ -42,6 +42,11 @@
ORDER BY isDir desc ORDER BY isDir desc
</select> </select>
<select id="selectUserFileByLikeRightFilePath" resultType="com.qiwenshare.file.domain.UserFile">
select * from userfile
where (filePath = #{filePath} or filePath like concat(#{filePath},'/%')) and userId = #{userId} and deleteFlag = 0
</select>
<update id="updateFilepathByFilepath"> <update id="updateFilepathByFilepath">
UPDATE userfile SET filePath=REPLACE(filePath, #{param1}, #{param2}) UPDATE userfile SET filePath=REPLACE(filePath, #{param1}, #{param2})