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 0534a25..372e0b6 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 @@ -11,7 +11,7 @@ import java.util.Map; 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); + List> userFileList(UserFile userFile, Long beginCount, Long pageCount); void updateFilepathByFilepath(String oldfilePath, String newfilePath, String fileName, String extendName); List> selectFileByExtendName(List fileNameList, 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 7ac57e1..6e128da 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 @@ -184,10 +184,16 @@ public class FileController { userFile.setUserId(sessionUserBean.getUserId()); } - + List> fileList = null; userFile.setFilePath(PathUtil.urlDecode(fileListDto.getFilePath())); + if (fileListDto.getCurrentPage() == null || fileListDto.getPageCount() == null) { + fileList = userFileService.userFileList(userFile, 0L, 10L); + } else { + Long beginCount = (fileListDto.getCurrentPage() - 1) * fileListDto.getPageCount(); - List> fileList = userFileService.userFileList(userFile); //fileService.selectFileListByPath(fileBean); + fileList = userFileService.userFileList(userFile, beginCount, fileListDto.getPageCount()); //fileService.selectFileListByPath(fileBean); + + } restResult.setData(fileList); restResult.setSuccess(true); diff --git a/file-web/src/main/java/com/qiwenshare/file/dto/FileListDto.java b/file-web/src/main/java/com/qiwenshare/file/dto/FileListDto.java index 7cb0001..43cf058 100644 --- a/file-web/src/main/java/com/qiwenshare/file/dto/FileListDto.java +++ b/file-web/src/main/java/com/qiwenshare/file/dto/FileListDto.java @@ -5,4 +5,7 @@ import lombok.Data; @Data public class FileListDto { private String filePath; + + private Long currentPage; + private Long pageCount; } 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 cff2793..9ca8139 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 @@ -11,7 +11,7 @@ import java.util.Map; public interface UserFileMapper extends BaseMapper { void replaceFilePath(@Param("filePath") String filePath, @Param("oldFilePath") String oldFilePath, @Param("userId") Long userId); - List> userFileList(UserFile userFile); + List> userFileList(UserFile userFile, Long beginCount, Long pageCount); void updateFilepathByPathAndName(String oldfilePath, String newfilePath, String fileName, String extendName); void updateFilepathByFilepath(String oldfilePath, String newfilePath); 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 efc2255..cb11ee4 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 @@ -44,8 +44,8 @@ public class UserFileService extends ServiceImpl impl } @Override - public List> userFileList(UserFile userFile) { - return userFileMapper.userFileList(userFile); + public List> userFileList(UserFile userFile, Long beginCount, Long pageCount) { + return userFileMapper.userFileList(userFile, beginCount, pageCount); } diff --git a/file-web/src/main/resources/mybatis/mapper/UserFileMapper.xml b/file-web/src/main/resources/mybatis/mapper/UserFileMapper.xml index 2ef9130..4cf36ad 100644 --- a/file-web/src/main/resources/mybatis/mapper/UserFileMapper.xml +++ b/file-web/src/main/resources/mybatis/mapper/UserFileMapper.xml @@ -26,6 +26,7 @@ and deleteFlag = 0 + limit #{beginCount} #{pageCount}