diff --git a/src/main/java/com/supervision/police/controller/PromptController.java b/src/main/java/com/supervision/police/controller/PromptController.java index 2c0fdc9..273f77e 100644 --- a/src/main/java/com/supervision/police/controller/PromptController.java +++ b/src/main/java/com/supervision/police/controller/PromptController.java @@ -25,15 +25,13 @@ public class PromptController { /** * 查询提示词 * - * @param notePrompt 提示词对象 + * @param notePromptDTO 提示词对象 * @return */ @PostMapping("/list") @Operation(summary = "查询提示词列表") - public R> listPrompt(@RequestBody NotePrompt notePrompt, - @RequestParam(required = false, defaultValue = "1") Integer page, - @RequestParam(required = false, defaultValue = "20") Integer size) { - IPage notePrompts = promptService.listPrompt(page, size, notePrompt); + public R> listPrompt(@RequestBody NotePromptDTO notePromptDTO) { + IPage notePrompts = promptService.listPrompt(notePromptDTO); return R.ok(notePrompts); } diff --git a/src/main/java/com/supervision/police/dto/NotePromptDTO.java b/src/main/java/com/supervision/police/dto/NotePromptDTO.java index c49113a..3d22f42 100644 --- a/src/main/java/com/supervision/police/dto/NotePromptDTO.java +++ b/src/main/java/com/supervision/police/dto/NotePromptDTO.java @@ -1,6 +1,7 @@ package com.supervision.police.dto; import com.supervision.police.domain.NotePrompt; +import io.swagger.models.auth.In; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,6 +11,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data public class NotePromptDTO extends NotePrompt { + private Integer page; + private Integer size; private Integer matchNum; private String fileId; private String text; diff --git a/src/main/java/com/supervision/police/service/NotePromptService.java b/src/main/java/com/supervision/police/service/NotePromptService.java index af45fb6..6f6c250 100644 --- a/src/main/java/com/supervision/police/service/NotePromptService.java +++ b/src/main/java/com/supervision/police/service/NotePromptService.java @@ -13,7 +13,7 @@ public interface NotePromptService extends IService { List listPromptBySplitId(String recordSplitId); - IPage listPrompt(int page, int size, NotePrompt notePrompt); + IPage listPrompt(NotePromptDTO notePromptDTO); List promptDebugging(NotePromptDTO notePromptDTO); diff --git a/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java b/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java index b28989e..fb9ad24 100644 --- a/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java @@ -115,8 +115,8 @@ public class NotePromptServiceImpl extends ServiceImpl listPrompt(int page, int size, NotePrompt notePrompt) { - return notePromptMapper.selectNotePromptWithMatchNum(new Page<>(page, size), notePrompt); + public IPage listPrompt(NotePromptDTO notePromptDTO) { + return notePromptMapper.selectNotePromptWithMatchNum(new Page<>(notePromptDTO.getPage(), notePromptDTO.getSize()), notePromptDTO); } @Override