From 9bd765cee50ced404f92590b060a8fc8e031acb7 Mon Sep 17 00:00:00 2001 From: MAC <1162714483@qq.com> Date: Thu, 3 Mar 2022 22:51:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=96=87=E4=BB=B6=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D):=20=E9=87=8D=E5=A4=8D=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E5=B5=8C=E5=A5=97=E6=97=B6=EF=BC=8C=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E6=B7=B7=E4=B9=B1=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/qiwenshare/file/api/IUserFileService.java | 2 +- .../com/qiwenshare/file/controller/FileController.java | 9 ++++++--- .../java/com/qiwenshare/file/mapper/UserFileMapper.java | 1 - .../com/qiwenshare/file/service/UserFileService.java | 4 ---- src/main/resources/mapper/UserFileMapper.xml | 4 ---- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/qiwenshare/file/api/IUserFileService.java b/src/main/java/com/qiwenshare/file/api/IUserFileService.java index 19839ac..dc07d9f 100644 --- a/src/main/java/com/qiwenshare/file/api/IUserFileService.java +++ b/src/main/java/com/qiwenshare/file/api/IUserFileService.java @@ -11,7 +11,7 @@ public interface IUserFileService extends IService { List selectUserFileByNameAndPath(String fileName, String filePath, Long userId); boolean isDirExist(String fileName, String filePath, long userId); List selectSameUserFile(String fileName, String filePath, String extendName, Long userId); - void replaceUserFilePath(String filePath, String oldFilePath, Long userId); + IPage userFileList(Long userId, String filePath, Long beginCount, Long pageCount); void updateFilepathByFilepath(String oldfilePath, String newfilePath, String fileName, String extendName, long userId); void userFileCopy(String oldfilePath, String newfilePath, String fileName, String extendName, long userId); diff --git a/src/main/java/com/qiwenshare/file/controller/FileController.java b/src/main/java/com/qiwenshare/file/controller/FileController.java index cd23d9b..5ee8480 100644 --- a/src/main/java/com/qiwenshare/file/controller/FileController.java +++ b/src/main/java/com/qiwenshare/file/controller/FileController.java @@ -176,10 +176,13 @@ public class FileController { .eq(UserFile::getUserFileId, renameFileDto.getUserFileId()); userFileService.update(lambdaUpdateWrapper); if (1 == userFile.getIsDir()) { - userFileService.replaceUserFilePath(userFile.getFilePath() + renameFileDto.getFileName() + "/", - userFile.getFilePath() + userFile.getFileName() + "/", sessionUserBean.getUserId()); - } + List list = userFileService.selectFileListLikeRightFilePath(userFile.getFilePath() + userFile.getFileName() + "/", sessionUserBean.getUserId()); + for (UserFile newUserFile : list) { + newUserFile.setFilePath(newUserFile.getFilePath().replaceFirst(userFile.getFilePath() + userFile.getFileName() + "/", userFile.getFilePath() + renameFileDto.getFileName() + "/")); + userFileService.updateById(newUserFile); + } + } fileDealComp.uploadESByUserFileId(renameFileDto.getUserFileId()); return RestResult.success(); } diff --git a/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java b/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java index 78c7d74..53be18d 100644 --- a/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java +++ b/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java @@ -8,7 +8,6 @@ import com.qiwenshare.file.vo.file.FileListVo; import org.apache.ibatis.annotations.Param; public interface UserFileMapper extends BaseMapper { - void replaceFilePath(@Param("filePath") String filePath, @Param("oldFilePath") String oldFilePath, @Param("userId") Long userId); void updateFilepathByPathAndName(String oldfilePath, String newfilePath, String fileName, String extendName, long userId); void updateFilepathByFilepath(String oldfilePath, String newfilePath, long userId); diff --git a/src/main/java/com/qiwenshare/file/service/UserFileService.java b/src/main/java/com/qiwenshare/file/service/UserFileService.java index 844c744..648cb39 100644 --- a/src/main/java/com/qiwenshare/file/service/UserFileService.java +++ b/src/main/java/com/qiwenshare/file/service/UserFileService.java @@ -81,10 +81,6 @@ public class UserFileService extends ServiceImpl impl return userFileMapper.selectList(lambdaQueryWrapper); } - @Override - public void replaceUserFilePath(String filePath, String oldFilePath, Long userId) { - userFileMapper.replaceFilePath(filePath, oldFilePath, userId); - } @Override public IPage userFileList(Long userId, String filePath, Long currentPage, Long pageCount) { diff --git a/src/main/resources/mapper/UserFileMapper.xml b/src/main/resources/mapper/UserFileMapper.xml index f194365..6fb5840 100644 --- a/src/main/resources/mapper/UserFileMapper.xml +++ b/src/main/resources/mapper/UserFileMapper.xml @@ -6,10 +6,6 @@ - - UPDATE userfile SET filepath=REPLACE(filepath, #{oldFilePath}, #{filePath}) - WHERE filepath LIKE N'${oldFilePath}%' and userId = #{userId}; -