From 65fdfd99a7cad3ac87d42e4ad096b89cf3331b8d Mon Sep 17 00:00:00 2001 From: jack ning Date: Thu, 12 Jun 2025 15:18:22 +0800 Subject: [PATCH] update modules/kbase: mod 9 files --- .../com/bytedesk/core/base/BaseRequest.java | 5 +++- .../bytedesk/core/message/MessageRequest.java | 4 ++-- .../bytedesk/core/thread/ThreadRequest.java | 4 ++-- .../kbase/article/ArticleRequest.java | 2 +- .../com/bytedesk/kbase/faq/FaqRequest.java | 2 +- .../kbase/quick_reply/QuickReplyRequest.java | 2 +- .../bytedesk/service/agent/AgentRequest.java | 6 +++-- .../service/agent/AgentSpecification.java | 23 ++++++++++++++++++- .../bytedesk/ticket/ticket/TicketRequest.java | 4 ++-- 9 files changed, 39 insertions(+), 13 deletions(-) diff --git a/modules/core/src/main/java/com/bytedesk/core/base/BaseRequest.java b/modules/core/src/main/java/com/bytedesk/core/base/BaseRequest.java index d31cdccb08..c86a495949 100644 --- a/modules/core/src/main/java/com/bytedesk/core/base/BaseRequest.java +++ b/modules/core/src/main/java/com/bytedesk/core/base/BaseRequest.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-01-29 16:21:24 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-05-09 12:49:01 + * @LastEditTime: 2025-06-12 14:58:27 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -115,6 +115,9 @@ public abstract class BaseRequest implements Serializable { @Builder.Default private String sortDirection = "descend"; + // + private String searchText; + /** * 获取分页对象 * 默认每页10条记录，按更新时间倒序排序 diff --git a/modules/core/src/main/java/com/bytedesk/core/message/MessageRequest.java b/modules/core/src/main/java/com/bytedesk/core/message/MessageRequest.java index be5d067504..b92cb95406 100644 --- a/modules/core/src/main/java/com/bytedesk/core/message/MessageRequest.java +++ b/modules/core/src/main/java/com/bytedesk/core/message/MessageRequest.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-02-21 10:00:32 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-05-26 13:12:57 + * @LastEditTime: 2025-06-12 14:59:38 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -45,5 +45,5 @@ public class MessageRequest extends BaseRequest { private String componentType; // 搜索关键字 - private String searchText; + // private String searchText; } diff --git a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadRequest.java b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadRequest.java index 56d5c2d004..d803a9ddcd 100644 --- a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadRequest.java +++ b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadRequest.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-02-21 10:01:12 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-05-16 16:20:52 + * @LastEditTime: 2025-06-12 14:59:10 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -105,7 +105,7 @@ public class ThreadRequest extends BaseRequest { @Builder.Default private List memberUids = new ArrayList<>(); - private String searchText; + // private String searchText; // used for client query private String componentType; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/article/ArticleRequest.java b/modules/kbase/src/main/java/com/bytedesk/kbase/article/ArticleRequest.java index 8476378f15..71b798f454 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/article/ArticleRequest.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/article/ArticleRequest.java @@ -112,7 +112,7 @@ public class ArticleRequest extends BaseRequest { private String userUid; // - private String searchText; + // private String searchText; // used for client query private String componentType; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRequest.java b/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRequest.java index 4b88439200..6b6151fb9b 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRequest.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRequest.java @@ -136,7 +136,7 @@ public class FaqRequest extends BaseRequest { private String user; // - private String searchText; + // private String searchText; // used for client query private String componentType; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/QuickReplyRequest.java b/modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/QuickReplyRequest.java index 77b157adb2..24d58fd458 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/QuickReplyRequest.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/QuickReplyRequest.java @@ -72,7 +72,7 @@ public class QuickReplyRequest extends BaseRequest { private String vectorStatus = QuickReplyStatusEnum.NEW.name(); // - private String searchText; + // private String searchText; // used for client query private String componentType; diff --git a/modules/service/src/main/java/com/bytedesk/service/agent/AgentRequest.java b/modules/service/src/main/java/com/bytedesk/service/agent/AgentRequest.java index 818f60128c..1da764bb9a 100644 --- a/modules/service/src/main/java/com/bytedesk/service/agent/AgentRequest.java +++ b/modules/service/src/main/java/com/bytedesk/service/agent/AgentRequest.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-02-06 10:16:30 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-05-05 10:54:31 + * @LastEditTime: 2025-06-12 14:58:04 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -102,5 +102,7 @@ public class AgentRequest extends BaseRequest { // @NotBlank private String memberUid; - + + // used for client query + private String componentType; } diff --git a/modules/service/src/main/java/com/bytedesk/service/agent/AgentSpecification.java b/modules/service/src/main/java/com/bytedesk/service/agent/AgentSpecification.java index 3a6d2312a4..ed557781f8 100644 --- a/modules/service/src/main/java/com/bytedesk/service/agent/AgentSpecification.java +++ b/modules/service/src/main/java/com/bytedesk/service/agent/AgentSpecification.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-06-07 11:44:54 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-03-14 10:09:25 + * @LastEditTime: 2025-06-12 15:00:11 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.List; import org.springframework.data.jpa.domain.Specification; +import org.springframework.util.StringUtils; import com.bytedesk.core.base.BaseSpecification; @@ -31,6 +32,26 @@ public class AgentSpecification extends BaseSpecification { return (root, query, criteriaBuilder) -> { List predicates = new ArrayList<>(); predicates.addAll(getBasicPredicates(root, criteriaBuilder, request.getOrgUid())); + // nickname + if (StringUtils.hasText(request.getNickname())) { + predicates.add(criteriaBuilder.like(root.get("nickname"), "%" + request.getNickname() + "%")); + } + // mobile + if (StringUtils.hasText(request.getMobile())) { + predicates.add(criteriaBuilder.like(root.get("mobile"), "%" + request.getMobile() + "%")); + } + // email + if (StringUtils.hasText(request.getEmail())) { + predicates.add(criteriaBuilder.like(root.get("email"), "%" + request.getEmail() + "%")); + } + // searchText + if (StringUtils.hasText(request.getSearchText())) { + predicates.add(criteriaBuilder.or( + criteriaBuilder.like(root.get("nickname"), "%" + request.getSearchText() + "%"), + criteriaBuilder.like(root.get("mobile"), "%" + request.getSearchText() + "%"), + criteriaBuilder.like(root.get("email"), "%" + request.getSearchText() + "%") + )); + } // return criteriaBuilder.and(predicates.toArray(new Predicate[0])); }; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/TicketRequest.java b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/TicketRequest.java index f0ffcf66be..a3e3b919ea 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/TicketRequest.java +++ b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/TicketRequest.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2025-01-16 14:58:38 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-08 14:39:33 + * @LastEditTime: 2025-06-12 14:59:51 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -35,7 +35,7 @@ public class TicketRequest extends BaseRequest { private String title; private String description; - private String searchText; + // private String searchText; // private String status; private String priority;