diff --git a/file-web/src/main/java/com/qiwenshare/file/api/IUserFileService.java b/file-web/src/main/java/com/qiwenshare/file/api/IUserFileService.java index 88a1b26..a17de0e 100644 --- a/file-web/src/main/java/com/qiwenshare/file/api/IUserFileService.java +++ b/file-web/src/main/java/com/qiwenshare/file/api/IUserFileService.java @@ -13,7 +13,7 @@ public interface IUserFileService extends IService { List selectUserFileByNameAndPath(String fileName, String filePath, Long userId); void replaceUserFilePath(String filePath, String oldFilePath, Long userId); List userFileList(UserFile userFile, Long beginCount, Long pageCount); - void updateFilepathByFilepath(String oldfilePath, String newfilePath, String fileName, String extendName); + void updateFilepathByFilepath(String oldfilePath, String newfilePath, String fileName, String extendName, long userId); List selectFileByExtendName(List fileNameList, Long beginCount, Long pageCount, long userId); Long selectCountByExtendName(List fileNameList, Long beginCount, Long pageCount, long userId); 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 67851d5..ab1374a 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 @@ -394,12 +394,14 @@ public class FileController { if (!operationCheck(token).getSuccess()){ return operationCheck(token); } + + UserBean sessionUserBean = userService.getUserBeanByToken(token); String oldfilePath = moveFileDto.getOldFilePath(); String newfilePath = moveFileDto.getFilePath(); String fileName = moveFileDto.getFileName(); String extendName = moveFileDto.getExtendName(); - userFileService.updateFilepathByFilepath(oldfilePath, newfilePath, fileName, extendName); + userFileService.updateFilepathByFilepath(oldfilePath, newfilePath, fileName, extendName, sessionUserBean.getUserId()); return RestResult.success(); } @@ -413,6 +415,7 @@ public class FileController { if (!operationCheck(token).getSuccess()) { return operationCheck(token); } + UserBean sessionUserBean = userService.getUserBeanByToken(token); String files = batchMoveFileDto.getFiles(); String newfilePath = batchMoveFileDto.getFilePath(); @@ -420,7 +423,7 @@ public class FileController { List fileList = JSON.parseArray(files, UserFile.class); for (UserFile userFile : fileList) { - userFileService.updateFilepathByFilepath(userFile.getFilePath(), newfilePath, userFile.getFileName(), userFile.getExtendName()); + userFileService.updateFilepathByFilepath(userFile.getFilePath(), newfilePath, userFile.getFileName(), userFile.getExtendName(), sessionUserBean.getUserId()); } return RestResult.success().data("批量移动文件成功"); diff --git a/file-web/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java b/file-web/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java index a2649ed..0d4b3b4 100644 --- a/file-web/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java +++ b/file-web/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java @@ -14,12 +14,12 @@ public interface UserFileMapper extends BaseMapper { void replaceFilePath(@Param("filePath") String filePath, @Param("oldFilePath") String oldFilePath, @Param("userId") Long userId); List userFileList(UserFile userFile, Long beginCount, Long pageCount); - void updateFilepathByPathAndName(String oldfilePath, String newfilePath, String fileName, String extendName); - void updateFilepathByFilepath(String oldfilePath, String newfilePath); + void updateFilepathByPathAndName(String oldfilePath, String newfilePath, String fileName, String extendName, long userId); + void updateFilepathByFilepath(String oldfilePath, String newfilePath, long userId); List selectFileByExtendName(List fileNameList, Long beginCount, Long pageCount, long userId); Long selectCountByExtendName(List fileNameList, Long beginCount, Long pageCount, long userId); List selectFileNotInExtendNames(List fileNameList, Long beginCount, Long pageCount, long userId); Long selectCountNotInExtendNames(List fileNameList, Long beginCount, Long pageCount, long userId); - Long selectStorageSizeByUserId(Long userId); + Long selectStorageSizeByUserId(@Param("userId") Long userId); } diff --git a/file-web/src/main/java/com/qiwenshare/file/service/UserFileService.java b/file-web/src/main/java/com/qiwenshare/file/service/UserFileService.java index 19e494b..fe254bb 100644 --- a/file-web/src/main/java/com/qiwenshare/file/service/UserFileService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/UserFileService.java @@ -108,12 +108,12 @@ public class UserFileService extends ServiceImpl impl // } @Override - public void updateFilepathByFilepath(String oldfilePath, String newfilePath, String fileName, String extendName) { + public void updateFilepathByFilepath(String oldfilePath, String newfilePath, String fileName, String extendName, long userId) { if ("null".equals(extendName)){ extendName = null; } //移动根目录 - userFileMapper.updateFilepathByPathAndName(oldfilePath, newfilePath, fileName, extendName); + userFileMapper.updateFilepathByPathAndName(oldfilePath, newfilePath, fileName, extendName, userId); //移动子目录 oldfilePath = oldfilePath + fileName + "/"; @@ -125,7 +125,7 @@ public class UserFileService extends ServiceImpl impl oldfilePath = oldfilePath.replace("_", "\\_"); if (extendName == null) { //为null说明是目录,则需要移动子目录 - userFileMapper.updateFilepathByFilepath(oldfilePath, newfilePath); + userFileMapper.updateFilepathByFilepath(oldfilePath, newfilePath, userId); } } diff --git a/file-web/src/main/resources/mybatis/mapper/UserFileMapper.xml b/file-web/src/main/resources/mybatis/mapper/UserFileMapper.xml index f41756b..652dbc6 100644 --- a/file-web/src/main/resources/mybatis/mapper/UserFileMapper.xml +++ b/file-web/src/main/resources/mybatis/mapper/UserFileMapper.xml @@ -73,7 +73,7 @@ UPDATE userfile SET filePath=REPLACE(filePath, #{param1}, #{param2}) - WHERE filePath like N'${param1}%' + WHERE filePath like N'${param1}%' and userId = #{param3} @@ -85,12 +85,13 @@ and extendName is null + and userId = #{param5} \ No newline at end of file