ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2026-05-19 13:48:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

update modules/kbase: mod 9 files

Browse Source
This commit is contained in:
jack ning
2025-06-12 15:18:22 +08:00
parent 9409a40e2e
commit 65fdfd99a7
9 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/main/java/com/bytedesk/core/base/BaseRequest.java
View File

@@ -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条记录，按更新时间倒序排序

4
modules/core/src/main/java/com/bytedesk/core/message/MessageRequest.java
View File

@@ -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;
}

4
modules/core/src/main/java/com/bytedesk/core/thread/ThreadRequest.java
View File

@@ -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<String> memberUids = new ArrayList<>();
private String searchText;
// private String searchText;
// used for client query
private String componentType;

2
modules/kbase/src/main/java/com/bytedesk/kbase/article/ArticleRequest.java
View File

@@ -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;

2
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRequest.java
View File

@@ -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;

2
modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/QuickReplyRequest.java
View File

@@ -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;

6
modules/service/src/main/java/com/bytedesk/service/agent/AgentRequest.java
View File

@@ -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;
}

23
modules/service/src/main/java/com/bytedesk/service/agent/AgentSpecification.java
View File

@@ -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<Predicate> 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]));
};

4
modules/ticket/src/main/java/com/bytedesk/ticket/ticket/TicketRequest.java
View File

@@ -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;