From b9895d541b2ee4514d4ab168b1c827869a670d87 Mon Sep 17 00:00:00 2001
From: LXW <1264174498@qq.com>
Date: Mon, 23 Oct 2023 22:14:04 +0800
Subject: [PATCH] (improvement)(chat) opt page query for show case (#278)

Co-authored-by: jolunoluo
---
 .../supersonic/chat/api/pojo/request/PageQueryInfoReq.java    | 4 ++++
 .../persistence/repository/impl/ChatQueryRepositoryImpl.java  | 2 +-
 .../tencent/supersonic/chat/service/impl/ChatServiceImpl.java | 3 +--
 .../src/main/resources/mapper/custom/ShowCaseCustomMapper.xml | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/PageQueryInfoReq.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/PageQueryInfoReq.java
index 130d98117..952973212 100644
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/PageQueryInfoReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/PageQueryInfoReq.java
@@ -13,4 +13,8 @@ public class PageQueryInfoReq {
     private String userName;
 
     private List<Long> ids;
+
+    public Integer getLimitStart() {
+        return this.pageSize * (this.current - 1);
+    }
 }
diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatQueryRepositoryImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatQueryRepositoryImpl.java
index 2c4e9f3c8..5bb874d1e 100644
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatQueryRepositoryImpl.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatQueryRepositoryImpl.java
@@ -79,7 +79,7 @@ public class ChatQueryRepositoryImpl implements ChatQueryRepository {
 
     @Override
     public List<QueryResp> queryShowCase(PageQueryInfoReq pageQueryInfoReq, int agentId) {
-        return showCaseCustomMapper.queryShowCase(pageQueryInfoReq.getCurrent(),
+        return showCaseCustomMapper.queryShowCase(pageQueryInfoReq.getLimitStart(),
                         pageQueryInfoReq.getPageSize(), agentId, pageQueryInfoReq.getUserName())
                 .stream().map(this::convertTo)
                 .collect(Collectors.toList());
diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java
index 1cbdced82..4be4d902c 100644
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java
@@ -169,8 +169,7 @@ public class ChatServiceImpl implements ChatService {
         });
         queryResps = new ArrayList<>(queryResps.stream()
                 .collect(Collectors.toMap(QueryResp::getQueryText, Function.identity(),
-                        (existing, replacement) -> existing, LinkedHashMap::new))
-                .values());
+                        (existing, replacement) -> existing, LinkedHashMap::new)).values());
         fillParseInfo(queryResps);
         Map<Long, List<QueryResp>> showCaseMap = queryResps.stream()
                 .collect(Collectors.groupingBy(QueryResp::getChatId));
diff --git a/chat/core/src/main/resources/mapper/custom/ShowCaseCustomMapper.xml b/chat/core/src/main/resources/mapper/custom/ShowCaseCustomMapper.xml
index e8f028dd4..0ec84e7aa 100644
--- a/chat/core/src/main/resources/mapper/custom/ShowCaseCustomMapper.xml
+++ b/chat/core/src/main/resources/mapper/custom/ShowCaseCustomMapper.xml
@@ -61,7 +61,7 @@
             from (
                select *
                from s2_chat_query
-               where query_state = 1 and agent_id = ${agentId}
+               where query_state = 1 and agent_id = ${agentId} and (score is null or score > 1)
                <if test="userName != null and userName != ''">
                      and user_name = #{userName}
                </if>