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

update modules/core: mod 5 files

Browse Source
This commit is contained in:
jack ning
2025-06-21 17:31:42 +08:00
parent 67be5a7cfe
commit 67feeb2f44
3 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/src/main/java/com/bytedesk/core/rbac/user/UserProtobuf.java
View File

@@ -82,30 +82,30 @@ public class UserProtobuf implements Serializable {
// 通过解析user字段中的type字段来判断 type=robot则为机器人，否则为访客
public Boolean isRobot() {
return getType().equalsIgnoreCase(UserTypeEnum.ROBOT.name());
return UserTypeEnum.ROBOT.name().equalsIgnoreCase(getType());
}
// 通过解析user字段中的type字段来判断 type=visitor则为访客，否则为客服
public Boolean isVisitor() {
return getType().equalsIgnoreCase(UserTypeEnum.VISITOR.name());
return UserTypeEnum.VISITOR.name().equalsIgnoreCase(getType());
}
public Boolean isUser() {
return getType().equalsIgnoreCase(UserTypeEnum.USER.name());
return UserTypeEnum.USER.name().equalsIgnoreCase(getType());
}
public Boolean isMember() {
return getType().equalsIgnoreCase(UserTypeEnum.MEMBER.name());
return UserTypeEnum.MEMBER.name().equalsIgnoreCase(getType());
}
// 是否系统消息
public Boolean isSystem() {
return getType().equalsIgnoreCase(UserTypeEnum.SYSTEM.name());
return UserTypeEnum.SYSTEM.name().equalsIgnoreCase(getType());
}
// 是否客服消息
public Boolean isAgent() {
return getType().equalsIgnoreCase(UserTypeEnum.AGENT.name());
return UserTypeEnum.AGENT.name().equalsIgnoreCase(getType());
}
}

42
modules/core/src/main/java/com/bytedesk/core/thread/ThreadEntity.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-06-18 15:05:22
* @LastEditTime: 2025-06-21 17:18: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.
@@ -69,72 +69,72 @@ public class ThreadEntity extends AbstractThreadEntity {
private List<MessageEntity> messages = new ArrayList<>();
public Boolean isNew() {
return getStatus().equals(ThreadProcessStatusEnum.NEW.name());
return ThreadProcessStatusEnum.NEW.name().equals(getStatus());
}
// ROBOTING
public Boolean isRoboting() {
return getStatus().equals(ThreadProcessStatusEnum.ROBOTING.name());
return ThreadProcessStatusEnum.ROBOTING.name().equals(getStatus());
}
// LLMING
public Boolean isLlmIng() {
return getStatus().equals(ThreadProcessStatusEnum.LLMING.name());
return ThreadProcessStatusEnum.LLMING.name().equals(getStatus());
}
// queuing
public Boolean isQueuing() {
return getStatus().equals(ThreadProcessStatusEnum.QUEUING.name());
return ThreadProcessStatusEnum.QUEUING.name().equals(getStatus());
}
// is offline
public Boolean isOffline() {
return getStatus().equals(ThreadProcessStatusEnum.OFFLINE.name());
return ThreadProcessStatusEnum.OFFLINE.name().equals(getStatus());
}
public Boolean isChatting() {
return getStatus().equals(ThreadProcessStatusEnum.CHATTING.name());
return ThreadProcessStatusEnum.CHATTING.name().equals(getStatus());
}
// TIMEOUT
public Boolean isTimeout() {
return getStatus().equals(ThreadProcessStatusEnum.TIMEOUT.name());
return ThreadProcessStatusEnum.TIMEOUT.name().equals(getStatus());
}
//
public Boolean isClosed() {
return getStatus().equals(ThreadProcessStatusEnum.CLOSED.name());
return ThreadProcessStatusEnum.CLOSED.name().equals(getStatus());
}
public Boolean isCustomerService() {
return getType().equals(ThreadTypeEnum.AGENT.name())
|| getType().equals(ThreadTypeEnum.WORKGROUP.name())
|| getType().equals(ThreadTypeEnum.ROBOT.name())
|| getType().equals(ThreadTypeEnum.UNIFIED.name());
return ThreadTypeEnum.AGENT.name().equals(getType())
|| ThreadTypeEnum.WORKGROUP.name().equals(getType())
|| ThreadTypeEnum.ROBOT.name().equals(getType())
|| ThreadTypeEnum.UNIFIED.name().equals(getType());
}
public Boolean isRobotType() {
return getType().equals(ThreadTypeEnum.ROBOT.name());
return ThreadTypeEnum.ROBOT.name().equals(getType());
}
public Boolean isWorkgroupType() {
return getType().equals(ThreadTypeEnum.WORKGROUP.name());
return ThreadTypeEnum.WORKGROUP.name().equals(getType());
}
public Boolean isAgentType() {
return getType().equals(ThreadTypeEnum.AGENT.name());
return ThreadTypeEnum.AGENT.name().equals(getType());
}
public Boolean isUnifiedType() {
return getType().equals(ThreadTypeEnum.UNIFIED.name());
return ThreadTypeEnum.UNIFIED.name().equals(getType());
}
public Boolean isWeChatMp() {
return getClient().equals(ClientEnum.WECHAT_MP.name());
return ClientEnum.WECHAT_MP.name().equals(getClient());
}
public Boolean isWeChatMini() {
return getClient().equals(ClientEnum.WECHAT_MINI.name());
return ClientEnum.WECHAT_MINI.name().equals(getClient());
}
// ---------------------------
@@ -204,8 +204,8 @@ public class ThreadEntity extends AbstractThreadEntity {
// 如果robot.type == UserTypeEnum.ROBOT.name() && agent.type == UserTypeEnum.AGENT.name()
public Boolean isRobotToAgent() {
return getRobotProtobuf() != null && getAgentProtobuf() != null
&& getRobotProtobuf().getType().equals(UserTypeEnum.ROBOT.name())
&& getAgentProtobuf().getType().equals(UserTypeEnum.AGENT.name());
&& UserTypeEnum.ROBOT.name().equals(getRobotProtobuf().getType())
&& UserTypeEnum.AGENT.name().equals(getAgentProtobuf().getType());
}
// 获取全部消息数量

38
modules/core/src/main/java/com/bytedesk/core/thread/ThreadProtobuf.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-02-21 10:01:27
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-06-16 11:41:24
* @LastEditTime: 2025-06-21 17:16:21
* @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.
@@ -57,71 +57,71 @@ public class ThreadProtobuf implements Serializable {
}
public Boolean isMember() {
return ThreadTypeEnum.MEMBER.equals(type);
return ThreadTypeEnum.MEMBER.equals(getType());
}
public Boolean isNew() {
return getStatus().equals(ThreadProcessStatusEnum.NEW);
return ThreadProcessStatusEnum.NEW.equals(getStatus());
}
// ROBOTING
public Boolean isRoboting() {
return getStatus().equals(ThreadProcessStatusEnum.ROBOTING);
return ThreadProcessStatusEnum.ROBOTING.equals(getStatus());
}
// LLMING
public Boolean isLlmIng() {
return getStatus().equals(ThreadProcessStatusEnum.LLMING);
return ThreadProcessStatusEnum.LLMING.equals(getStatus());
}
// queuing
public Boolean isQueuing() {
return getStatus().equals(ThreadProcessStatusEnum.QUEUING);
return ThreadProcessStatusEnum.QUEUING.equals(getStatus());
}
// is offline
public Boolean isOffline() {
return getStatus().equals(ThreadProcessStatusEnum.OFFLINE);
return ThreadProcessStatusEnum.OFFLINE.equals(getStatus());
}
public Boolean isChatting() {
return getStatus().equals(ThreadProcessStatusEnum.CHATTING);
return ThreadProcessStatusEnum.CHATTING.equals(getStatus());
}
//
public Boolean isClosed() {
return getStatus().equals(ThreadProcessStatusEnum.CLOSED);
return ThreadProcessStatusEnum.CLOSED.equals(getStatus());
}
public Boolean isCustomerService() {
return getType().equals(ThreadTypeEnum.AGENT)
|| getType().equals(ThreadTypeEnum.WORKGROUP)
|| getType().equals(ThreadTypeEnum.ROBOT)
|| getType().equals(ThreadTypeEnum.UNIFIED);
return ThreadTypeEnum.AGENT.equals(getType())
|| ThreadTypeEnum.WORKGROUP.equals(getType())
|| ThreadTypeEnum.ROBOT.equals(getType())
|| ThreadTypeEnum.UNIFIED.equals(getType());
}
public Boolean isRobotType() {
return getType().equals(ThreadTypeEnum.ROBOT);
return ThreadTypeEnum.ROBOT.equals(getType());
}
public Boolean isWorkgroupType() {
return getType().equals(ThreadTypeEnum.WORKGROUP);
return ThreadTypeEnum.WORKGROUP.equals(getType());
}
public Boolean isAgentType() {
return getType().equals(ThreadTypeEnum.AGENT);
return ThreadTypeEnum.AGENT.equals(getType());
}
public Boolean isUnifiedType() {
return getType().equals(ThreadTypeEnum.UNIFIED);
return ThreadTypeEnum.UNIFIED.equals(getType());
}
public Boolean isWeChatMp() {
return getClient().equals(ClientEnum.WECHAT_MP);
return ClientEnum.WECHAT_MP.equals(getClient());
}
public Boolean isWeChatMini() {
return getClient().equals(ClientEnum.WECHAT_MINI);
return ClientEnum.WECHAT_MINI.equals(getClient());
}
// public static ThreadProtobuf fromEntity(ThreadEntity thread) {