diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java index fc5a586e..d323bc6b 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java @@ -39,13 +39,10 @@ public class KnowledgeBaseController { public Result> getPageList( @RequestParam(required = false) String name, @RequestParam(required = false, defaultValue = "1") Integer page, - @RequestParam(required = false, defaultValue = "10") Integer page_size, - @RequestParam(required = false) String orderby, - @RequestParam(required = false) Boolean desc) { + @RequestParam(required = false, defaultValue = "10") Integer page_size) { KnowledgeBaseDTO knowledgeBaseDTO = new KnowledgeBaseDTO(); knowledgeBaseDTO.setName(name); - PageData pageData = knowledgeBaseService.getPageList(knowledgeBaseDTO, String.valueOf(page), - String.valueOf(page_size)); + PageData pageData = knowledgeBaseService.getPageList(knowledgeBaseDTO, page, page_size); return new Result>().ok(pageData); } diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeBaseService.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeBaseService.java index 8ed34d46..7c2ffef8 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeBaseService.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeBaseService.java @@ -20,7 +20,7 @@ public interface KnowledgeBaseService extends BaseService { * @param limit 每页数量 * @return 分页数据 */ - PageData getPageList(KnowledgeBaseDTO knowledgeBaseDTO, String page, String limit); + PageData getPageList(KnowledgeBaseDTO knowledgeBaseDTO, Integer page, Integer limit); /** * 根据ID获取知识库详情 diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java index 4448f4b3..80053ef6 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java @@ -46,9 +46,9 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl getPageList(KnowledgeBaseDTO knowledgeBaseDTO, String page, String limit) { - long curPage = Long.parseLong(page); - long pageSize = Long.parseLong(limit); + public PageData getPageList(KnowledgeBaseDTO knowledgeBaseDTO, Integer page, Integer limit) { + long curPage = page; + long pageSize = limit; Page pageInfo = new Page<>(curPage, pageSize); QueryWrapper queryWrapper = new QueryWrapper<>();