From 2f5e36f7df02fa0c17ffdeb6249e42690898a4db Mon Sep 17 00:00:00 2001
From: "DESKTOP-DDTUS3E\\yaxin" <daixiaoyi0622@gmail.com>
Date: Mon, 28 Oct 2024 09:23:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=8D=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/police/controller/PromptController.java   | 8 +++-----
 .../java/com/supervision/police/dto/NotePromptDTO.java    | 3 +++
 .../com/supervision/police/service/NotePromptService.java | 2 +-
 .../police/service/impl/NotePromptServiceImpl.java        | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

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<IPage<NotePromptDTO>> listPrompt(@RequestBody NotePrompt notePrompt,
-                                              @RequestParam(required = false, defaultValue = "1") Integer page,
-                                              @RequestParam(required = false, defaultValue = "20") Integer size) {
-        IPage<NotePromptDTO> notePrompts = promptService.listPrompt(page, size, notePrompt);
+    public R<IPage<NotePromptDTO>> listPrompt(@RequestBody NotePromptDTO notePromptDTO) {
+        IPage<NotePromptDTO> 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<NotePrompt> {
     List<NotePrompt> listPromptBySplitId(String recordSplitId);
 
 
-    IPage<NotePromptDTO> listPrompt(int page, int size, NotePrompt notePrompt);
+    IPage<NotePromptDTO> 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<NotePromptMapper, NotePro
     }
 
     @Override
-    public IPage<NotePromptDTO> listPrompt(int page, int size, NotePrompt notePrompt) {
-        return notePromptMapper.selectNotePromptWithMatchNum(new Page<>(page, size), notePrompt);
+    public IPage<NotePromptDTO> listPrompt(NotePromptDTO notePromptDTO) {
+        return notePromptMapper.selectNotePromptWithMatchNum(new Page<>(notePromptDTO.getPage(), notePromptDTO.getSize()), notePromptDTO);
     }
 
     @Override