From 73cca3e4ec99a948f8cc7795ead7c6e8c3105262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E8=8B=B1=E6=9D=B0?= <327782001@qq.com>
Date: Thu, 13 Jul 2023 22:56:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ChatbotController.java          | 18 +++++++++++++++++-
 .../kwan/springbootkwan/entity/Chatbot.java    |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/kwan/springbootkwan/controller/ChatbotController.java b/src/main/java/com/kwan/springbootkwan/controller/ChatbotController.java
index 56819ce..0f113d5 100644
--- a/src/main/java/com/kwan/springbootkwan/controller/ChatbotController.java
+++ b/src/main/java/com/kwan/springbootkwan/controller/ChatbotController.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kwan.springbootkwan.entity.Chatbot;
 import com.kwan.springbootkwan.entity.Result;
 import com.kwan.springbootkwan.service.ChatbotService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -59,12 +60,18 @@ public class ChatbotController {
      * @return 所有数据
      */
     @GetMapping("/page")
-    public Result selectAll(@RequestParam Integer page, @RequestParam Integer pageSize) {
+    public Result selectAll(@RequestParam Integer page
+            , @RequestParam Integer pageSize
+            , @RequestParam String question) {
         Page<Chatbot> page1 = new Page<>();
         page1.setCurrent(page);
         page1.setSize(pageSize);
         QueryWrapper<Chatbot> wrapper = new QueryWrapper<>();
         wrapper.orderByDesc("id"); // 按照 id 字段降序排列
+        wrapper.eq("is_delete", 0); // 按照 id 字段降序排列
+        if (StringUtils.isNotEmpty(question)) {
+            wrapper.like("question", question);
+        }
         return Result.ok(this.chatbotService.page(page1, wrapper));
     }
 
@@ -111,5 +118,14 @@ public class ChatbotController {
     public Result delete(@RequestParam("idList") List<Long> idList) {
         return Result.ok(this.chatbotService.removeByIds(idList));
     }
+
+    @GetMapping("/delete")
+    public Result delete(@RequestParam("id") Integer id) {
+        Chatbot chatbot = new Chatbot();
+        chatbot.setIsDelete(1);
+        QueryWrapper<Chatbot> wrapper = new QueryWrapper<>();
+        wrapper.eq("id", id);
+        return Result.ok(chatbotService.update(chatbot, wrapper));
+    }
 }
 
diff --git a/src/main/java/com/kwan/springbootkwan/entity/Chatbot.java b/src/main/java/com/kwan/springbootkwan/entity/Chatbot.java
index efbd55a..e748c97 100644
--- a/src/main/java/com/kwan/springbootkwan/entity/Chatbot.java
+++ b/src/main/java/com/kwan/springbootkwan/entity/Chatbot.java
@@ -19,4 +19,5 @@ public class Chatbot extends Model<Chatbot> {
     private String question;
     private String response;
     private Date createTime;
+    private Integer isDelete;
 }
\ No newline at end of file
-- 
GitLab