Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-27 01:23:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:修改分页传递参数

Browse Source
This commit is contained in:
rainv123
2025-11-05 14:50:52 +08:00
parent 7215ded7e8
commit 3eeace5d5f
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java
+2 -5
View File
@@ -39,13 +39,10 @@ public class KnowledgeBaseController {
public Result<PageData<KnowledgeBaseDTO>> getPageList( public Result<PageData<KnowledgeBaseDTO>> getPageList(
@RequestParam(required = false) String name, @RequestParam(required = false) String name,
@RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "1") Integer page,
@RequestParam(required = false, defaultValue = "10") Integer page_size, @RequestParam(required = false, defaultValue = "10") Integer page_size) {
@RequestParam(required = false) String orderby,
@RequestParam(required = false) Boolean desc) {
KnowledgeBaseDTO knowledgeBaseDTO = new KnowledgeBaseDTO(); KnowledgeBaseDTO knowledgeBaseDTO = new KnowledgeBaseDTO();
knowledgeBaseDTO.setName(name); knowledgeBaseDTO.setName(name);
PageData<KnowledgeBaseDTO> pageData = knowledgeBaseService.getPageList(knowledgeBaseDTO, String.valueOf(page), PageData<KnowledgeBaseDTO> pageData = knowledgeBaseService.getPageList(knowledgeBaseDTO, page, page_size);
String.valueOf(page_size));
return new Result<PageData<KnowledgeBaseDTO>>().ok(pageData); return new Result<PageData<KnowledgeBaseDTO>>().ok(pageData);
} }
main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeBaseService.java
+1 -1
View File
@@ -20,7 +20,7 @@ public interface KnowledgeBaseService extends BaseService<KnowledgeBaseEntity> {
* @param limit 每页数量 * @param limit 每页数量
* @return 分页数据 * @return 分页数据
*/ */
PageData<KnowledgeBaseDTO> getPageList(KnowledgeBaseDTO knowledgeBaseDTO, String page, String limit); PageData<KnowledgeBaseDTO> getPageList(KnowledgeBaseDTO knowledgeBaseDTO, Integer page, Integer limit);
/** /**
* 根据ID获取知识库详情 * 根据ID获取知识库详情
main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java
+3 -3
View File
@@ -46,9 +46,9 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
private RestTemplate restTemplate = new RestTemplate(); private RestTemplate restTemplate = new RestTemplate();
@Override @Override
public PageData<KnowledgeBaseDTO> getPageList(KnowledgeBaseDTO knowledgeBaseDTO, String page, String limit) { public PageData<KnowledgeBaseDTO> getPageList(KnowledgeBaseDTO knowledgeBaseDTO, Integer page, Integer limit) {
long curPage = Long.parseLong(page); long curPage = page;
long pageSize = Long.parseLong(limit); long pageSize = limit;
Page<KnowledgeBaseEntity> pageInfo = new Page<>(curPage, pageSize); Page<KnowledgeBaseEntity> pageInfo = new Page<>(curPage, pageSize);
QueryWrapper<KnowledgeBaseEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<KnowledgeBaseEntity> queryWrapper = new QueryWrapper<>();