From 92a4044c2e8a68f1d98f55335b7caeb68a00e5d2 Mon Sep 17 00:00:00 2001
From: jack ning <github@bytedesk.com>
Date: Thu, 26 Dec 2024 10:17:23 +0800
Subject: [PATCH] update

---
 .../core/config/BytedeskEventPublisher.java   |  2 +-
 .../bytedesk/core/thread/ThreadEntity.java    |  3 +-
 .../core/thread/ThreadEventListener.java      |  1 +
 .../core/thread/ThreadRestService.java        | 12 +++----
 .../core/thread/event/ThreadAcceptEvent.java  | 34 +++++++++++++++++++
 .../thread/{ => event}/ThreadUpdateEvent.java |  4 ++-
 .../service/agent/AgentEventListener.java     |  2 +-
 .../service/queue/QueueEventListener.java     | 11 ++++--
 .../QueueMemberEventListener.java             | 12 +++++--
 .../service/utils/ConvertServiceUtils.java    |  5 +--
 .../VisitorThreadEventListener.java           |  2 +-
 11 files changed, 70 insertions(+), 18 deletions(-)
 create mode 100644 modules/core/src/main/java/com/bytedesk/core/thread/event/ThreadAcceptEvent.java
 rename modules/core/src/main/java/com/bytedesk/core/thread/{ => event}/ThreadUpdateEvent.java (92%)

diff --git a/modules/core/src/main/java/com/bytedesk/core/config/BytedeskEventPublisher.java b/modules/core/src/main/java/com/bytedesk/core/config/BytedeskEventPublisher.java
index 1f74f8c30e..5e55d38b65 100644
--- a/modules/core/src/main/java/com/bytedesk/core/config/BytedeskEventPublisher.java
+++ b/modules/core/src/main/java/com/bytedesk/core/config/BytedeskEventPublisher.java
@@ -46,8 +46,8 @@ import com.bytedesk.core.socket.stomp.StompDisconnectedEvent;
 import com.bytedesk.core.socket.stomp.StompSubscribeEvent;
 import com.bytedesk.core.socket.stomp.StompUnsubscribeEvent;
 import com.bytedesk.core.thread.ThreadEntity;
-import com.bytedesk.core.thread.ThreadUpdateEvent;
 import com.bytedesk.core.thread.event.ThreadCreateEvent;
+import com.bytedesk.core.thread.event.ThreadUpdateEvent;
 import com.bytedesk.core.topic.TopicCreateEvent;
 import com.bytedesk.core.topic.TopicUpdateEvent;
 
diff --git a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadEntity.java b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadEntity.java
index def1e31342..ac0f2b67b6 100644
--- a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadEntity.java
+++ b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadEntity.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-01-29 16:21:24
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2024-12-25 17:58:04
+ * @LastEditTime: 2024-12-26 10:13:41
  * @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. 
@@ -154,6 +154,7 @@ public class ThreadEntity extends BaseEntity {
      * 技能组客服对话中，存储技能组信息
      * 机器人对话中，存储机器人信息
      * 用户私聊、群聊、同事会话中，无需存储，使用owner字段信息
+     * @{UserProtobuf}
      */
     @Builder.Default
     @Column(columnDefinition = TypeConsts.COLUMN_TYPE_JSON)
diff --git a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadEventListener.java b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadEventListener.java
index f00832964b..fd044fb33c 100644
--- a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadEventListener.java
+++ b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadEventListener.java
@@ -26,6 +26,7 @@ import com.bytedesk.core.quartz.event.QuartzOneMinEvent;
 import com.bytedesk.core.rbac.user.UserEntity;
 import com.bytedesk.core.rbac.user.UserUpdateEvent;
 import com.bytedesk.core.thread.event.ThreadCreateEvent;
+import com.bytedesk.core.thread.event.ThreadUpdateEvent;
 import com.bytedesk.core.topic.TopicCacheService;
 import com.bytedesk.core.topic.TopicRequest;
 import com.bytedesk.core.topic.TopicService;
diff --git a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadRestService.java b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadRestService.java
index 988c8cb037..4fdfdacba8 100644
--- a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadRestService.java
+++ b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadRestService.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-01-29 16:21:24
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2024-12-25 22:30:53
+ * @LastEditTime: 2024-12-26 10:12:56
  * @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. 
@@ -46,6 +46,7 @@ import com.bytedesk.core.constant.BytedeskConsts;
 import com.bytedesk.core.constant.I18Consts;
 import com.bytedesk.core.rbac.user.UserProtobuf;
 import com.bytedesk.core.rbac.user.UserUtils;
+import com.bytedesk.core.thread.event.ThreadAcceptEvent;
 import com.bytedesk.core.thread.event.ThreadCloseEvent;
 import com.bytedesk.core.topic.TopicUtils;
 import com.bytedesk.core.uid.UidUtils;
@@ -347,18 +348,17 @@ public class ThreadRestService extends BaseRestService<ThreadEntity, ThreadReque
         if (!threadOptional.isPresent()) {
             throw new RuntimeException("accept thread " + threadRequest.getUid() + " not found");
         }
-
         ThreadEntity thread = threadOptional.get();
-        // thread.setAgentUid(threadRequest.getAgentUid());
+        thread.setState(ThreadStateEnum.STARTED.name());
+        thread.setAgent(threadRequest.getAgent());
         // thread.setAcceptType(threadRequest.getAcceptType());
-        // thread.setQueueNumber(threadRequest.getQueueNumber());
         //
         ThreadEntity updateThread = save(thread);
         if (updateThread == null) {
             throw new RuntimeException("thread save failed");
         }
-
-        // TODO: 通知queue更新，queue member更新
+        // 通知queue更新，queue member更新
+        bytedeskEventPublisher.publishEvent(new ThreadAcceptEvent(updateThread));
 
         return convertToResponse(updateThread);
     }
diff --git a/modules/core/src/main/java/com/bytedesk/core/thread/event/ThreadAcceptEvent.java b/modules/core/src/main/java/com/bytedesk/core/thread/event/ThreadAcceptEvent.java
new file mode 100644
index 0000000000..585846b3df
--- /dev/null
+++ b/modules/core/src/main/java/com/bytedesk/core/thread/event/ThreadAcceptEvent.java
@@ -0,0 +1,34 @@
+/*
+ * @Author: jackning 270580156@qq.com
+ * @Date: 2024-04-23 08:51:27
+ * @LastEditors: jackning 270580156@qq.com
+ * @LastEditTime: 2024-12-26 09:54:19
+ * @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. 
+ *  仅支持企业内部员工自用，严禁私自用于销售、二次销售或者部署SaaS方式销售 
+ *  Business Source License 1.1: https://github.com/Bytedesk/bytedesk/blob/main/LICENSE 
+ *  contact: 270580156@qq.com 
+ *  联系：270580156@qq.com
+ * Copyright (c) 2024 by bytedesk.com, All Rights Reserved. 
+ */
+package com.bytedesk.core.thread.event;
+
+import org.springframework.context.ApplicationEvent;
+
+import com.bytedesk.core.thread.ThreadEntity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ThreadAcceptEvent extends ApplicationEvent {
+
+    private ThreadEntity thread;
+
+    public ThreadAcceptEvent(ThreadEntity thread) {
+        super(thread);
+        this.thread = thread;
+    }
+}
diff --git a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadUpdateEvent.java b/modules/core/src/main/java/com/bytedesk/core/thread/event/ThreadUpdateEvent.java
similarity index 92%
rename from modules/core/src/main/java/com/bytedesk/core/thread/ThreadUpdateEvent.java
rename to modules/core/src/main/java/com/bytedesk/core/thread/event/ThreadUpdateEvent.java
index 26958f0b7f..e5c30e9bc0 100644
--- a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadUpdateEvent.java
+++ b/modules/core/src/main/java/com/bytedesk/core/thread/event/ThreadUpdateEvent.java
@@ -12,10 +12,12 @@
  *  联系：270580156@qq.com
  * Copyright (c) 2024 by bytedesk.com, All Rights Reserved. 
  */
-package com.bytedesk.core.thread;
+package com.bytedesk.core.thread.event;
 
 import org.springframework.context.ApplicationEvent;
 
+import com.bytedesk.core.thread.ThreadEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/modules/service/src/main/java/com/bytedesk/service/agent/AgentEventListener.java b/modules/service/src/main/java/com/bytedesk/service/agent/AgentEventListener.java
index c5e1dcf32c..b3fb91427b 100644
--- a/modules/service/src/main/java/com/bytedesk/service/agent/AgentEventListener.java
+++ b/modules/service/src/main/java/com/bytedesk/service/agent/AgentEventListener.java
@@ -35,9 +35,9 @@ import com.bytedesk.core.socket.mqtt.MqttConnectedEvent;
 import com.bytedesk.core.socket.mqtt.MqttConnectionService;
 import com.bytedesk.core.socket.mqtt.MqttDisconnectedEvent;
 import com.bytedesk.core.thread.ThreadEntity;
-import com.bytedesk.core.thread.ThreadUpdateEvent;
 import com.bytedesk.core.thread.event.ThreadCloseEvent;
 import com.bytedesk.core.thread.event.ThreadCreateEvent;
+import com.bytedesk.core.thread.event.ThreadUpdateEvent;
 import com.bytedesk.core.uid.UidUtils;
 import com.bytedesk.kbase.knowledge_base.KnowledgebaseRequest;
 import com.bytedesk.kbase.knowledge_base.KnowledgebaseService;
diff --git a/modules/service/src/main/java/com/bytedesk/service/queue/QueueEventListener.java b/modules/service/src/main/java/com/bytedesk/service/queue/QueueEventListener.java
index 41ced38df8..20291966c3 100644
--- a/modules/service/src/main/java/com/bytedesk/service/queue/QueueEventListener.java
+++ b/modules/service/src/main/java/com/bytedesk/service/queue/QueueEventListener.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-05-29 22:19:11
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2024-12-25 23:40:08
+ * @LastEditTime: 2024-12-26 10:03:14
  * @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. 
@@ -18,9 +18,10 @@ import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
 import com.bytedesk.core.thread.ThreadEntity;
-import com.bytedesk.core.thread.ThreadUpdateEvent;
+import com.bytedesk.core.thread.event.ThreadAcceptEvent;
 import com.bytedesk.core.thread.event.ThreadCloseEvent;
 import com.bytedesk.core.thread.event.ThreadCreateEvent;
+import com.bytedesk.core.thread.event.ThreadUpdateEvent;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -48,4 +49,10 @@ public class QueueEventListener {
         log.info("queue onThreadCloseEvent: {}", thread.getAgent());
     }
     
+
+    @EventListener
+    public void onThreadAcceptEvent(ThreadAcceptEvent event) {
+        ThreadEntity thread = event.getThread();
+        log.info("queue onThreadAcceptEvent: {}", thread.getAgent());
+    }
 }
diff --git a/modules/service/src/main/java/com/bytedesk/service/queue_member/QueueMemberEventListener.java b/modules/service/src/main/java/com/bytedesk/service/queue_member/QueueMemberEventListener.java
index 2f5ac83eed..3d1ab8b991 100644
--- a/modules/service/src/main/java/com/bytedesk/service/queue_member/QueueMemberEventListener.java
+++ b/modules/service/src/main/java/com/bytedesk/service/queue_member/QueueMemberEventListener.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-10-18 07:51:39
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2024-12-25 23:40:21
+ * @LastEditTime: 2024-12-26 10:03:24
  * @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. 
@@ -18,9 +18,10 @@ import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
 import com.bytedesk.core.thread.ThreadEntity;
-import com.bytedesk.core.thread.ThreadUpdateEvent;
+import com.bytedesk.core.thread.event.ThreadAcceptEvent;
 import com.bytedesk.core.thread.event.ThreadCloseEvent;
 import com.bytedesk.core.thread.event.ThreadCreateEvent;
+import com.bytedesk.core.thread.event.ThreadUpdateEvent;
 import com.bytedesk.service.queue_member.event.QueueMemberCreateEvent;
 
 import lombok.AllArgsConstructor;
@@ -56,5 +57,10 @@ public class QueueMemberEventListener {
         ThreadEntity thread = event.getThread();
         log.info("queue member onThreadCloseEvent: {}", thread.getAgent());
     }
-    
+
+    @EventListener
+    public void onThreadAcceptEvent(ThreadAcceptEvent event) {
+        ThreadEntity thread = event.getThread();
+        log.info("queue member onThreadAcceptEvent: {}", thread.getAgent());
+    }
 }
diff --git a/modules/service/src/main/java/com/bytedesk/service/utils/ConvertServiceUtils.java b/modules/service/src/main/java/com/bytedesk/service/utils/ConvertServiceUtils.java
index 7821087adf..15f84b8ba7 100644
--- a/modules/service/src/main/java/com/bytedesk/service/utils/ConvertServiceUtils.java
+++ b/modules/service/src/main/java/com/bytedesk/service/utils/ConvertServiceUtils.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-06-04 11:25:45
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2024-12-24 10:53:27
+ * @LastEditTime: 2024-12-26 10:11:28
  * @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. 
@@ -108,7 +108,8 @@ public class ConvertServiceUtils {
     }
 
     public static String convertToUserProtobufJSONString(AgentEntity agent) {
-        return JSON.toJSONString(convertToUserProtobuf(agent));
+        UserProtobuf userProtobuf = convertToUserProtobuf(agent);
+        return JSON.toJSONString(userProtobuf);
     }
 
     //
diff --git a/modules/service/src/main/java/com/bytedesk/service/visitor_thread/VisitorThreadEventListener.java b/modules/service/src/main/java/com/bytedesk/service/visitor_thread/VisitorThreadEventListener.java
index c07a6e257f..8e073c62a5 100644
--- a/modules/service/src/main/java/com/bytedesk/service/visitor_thread/VisitorThreadEventListener.java
+++ b/modules/service/src/main/java/com/bytedesk/service/visitor_thread/VisitorThreadEventListener.java
@@ -17,8 +17,8 @@ package com.bytedesk.service.visitor_thread;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
-import com.bytedesk.core.thread.ThreadUpdateEvent;
 import com.bytedesk.core.thread.event.ThreadCreateEvent;
+import com.bytedesk.core.thread.event.ThreadUpdateEvent;
 import com.bytedesk.core.quartz.event.QuartzOneMinEvent;
 import com.bytedesk.core.thread.ThreadEntity;