update

2026-05-23 17:57:47 +00:00 · 2025-04-04 10:33:59 +08:00
parent 199b26f858
commit d8217c808e
17 changed files with 35 additions and 47 deletions
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/thread/ThreadProcessEventListener.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/ThreadProcessEventListener.java
@@ -2,7 +2,7 @@
 * @Author: jackning 270580156@qq.com
 * @Date: 2025-04-01 14:08:03
 * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-04-01 14:59:08
+ * @LastEditTime: 2025-04-04 10:32: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. 
@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@Component
@RequiredArgsConstructor
-public class TicketThreadEventListener {
+public class ThreadProcessEventListener {

    // private final RuntimeService runtimeService;

--- a/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadCompletionDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadCompletionDelegate.java
@@ -2,7 +2,7 @@
 * @Author: jackning 270580156@qq.com
 * @Date: 2025-03-24 10:00:00
 * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-03-24 17:26:10
+ * @LastEditTime: 2025-04-04 10:32:22
 * @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. 
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.thread.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadHumanServiceDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadHumanServiceDelegate.java
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.thread.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadInitializeDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadInitializeDelegate.java
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.thread.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadQueueServiceDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadQueueServiceDelegate.java
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.thread.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadRobotIdleTimeoutServiceDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadRobotIdleTimeoutServiceDelegate.java
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.thread.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadRobotServiceDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadRobotServiceDelegate.java
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.thread.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadSLATimeoutNotificationDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadSLATimeoutNotificationDelegate.java
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.thread.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadSatisfactionServiceDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadSatisfactionServiceDelegate.java
@@ -2,7 +2,7 @@
 * @Author: jackning 270580156@qq.com
 * @Date: 2025-03-24 09:00:00
 * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-03-24 09:00:00
+ * @LastEditTime: 2025-04-04 10:24:00
 * @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. 
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.thread.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
@@ -32,8 +32,8 @@ import java.util.Map;
 * - 处理评价反馈
 */
@Slf4j
-@Component("threadSatisfactionDelegate")
-public class ThreadSatisfactionDelegate implements JavaDelegate {
+@Component("threadSatisfactionServiceDelegate")
+public class ThreadSatisfactionServiceDelegate implements JavaDelegate {

    @Override
    public void execute(DelegateExecution execution) {
@@ -209,4 +209,4 @@ public class ThreadSatisfactionDelegate implements JavaDelegate {
        execution.setVariable("satisfactionNeedsFollowUp", true);
        execution.setVariable("satisfactionFollowUpReason", "Customer unsatisfied: " + comment);
    }
-} 
+}
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadTransferServiceDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadTransferServiceDelegate.java
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.thread.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketAutoCloseDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketAutoCloseDelegate.java
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.ticket.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketCloseDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketCloseDelegate.java
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.ticket.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketEscalateDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketEscalateDelegate.java
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.ticket.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketEvaluatePriorityDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketEvaluatePriorityDelegate.java
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.ticket.delegate;

 import java.util.Optional;

--- a/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketMessageDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketMessageDelegate.java
@@ -1,4 +1,4 @@
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.ticket.delegate;


 import org.flowable.engine.delegate.DelegateExecution;
--- a/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketSLATimeoutNotificationDelegate.java
+++ b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketSLATimeoutNotificationDelegate.java
@@ -11,7 +11,7 @@
 * 
 * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. 
 */
-package com.bytedesk.ticket.delegate;
+package com.bytedesk.ticket.ticket.delegate;

 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
--- a/modules/ticket/src/main/resources/processes/thread-process.bpmn20.xml
+++ b/modules/ticket/src/main/resources/processes/thread-process.bpmn20.xml
@@ -35,15 +35,8 @@
      <conditionExpression xsi:type="tFormalExpression">${agentsBusy == true}</conditionExpression>
    </sequenceFlow>
    <userTask id="humanService" name="人工接待" flowable:candidateGroups="${agentGroupId}" flowable:formFieldValidation="true">
-      <documentation>客服人员接待访客</documentation>
+      <documentation>客服人员接待访客，流程外处理流转和协助</documentation>
      <extensionElements>
-        <flowable:formProperty id="threadUid" name="会话ID" type="string" required="true" />
-        <flowable:formProperty id="status" name="状态" type="enum" required="true">
-          <flowable:value id="ACTIVE" name="接待中" />
-          <flowable:value id="TRANSFER" name="需要转接" />
-          <flowable:value id="INVITE" name="邀请协助" />
-          <flowable:value id="RESOLVED" name="已解决" />
-        </flowable:formProperty>
        <flowable:executionListener event="start" delegateExpression="${threadExecutionListener}" />
        <flowable:executionListener event="end" delegateExpression="${threadExecutionListener}" />
        <flowable:taskListener event="create" delegateExpression="${threadTaskListener}" />
@@ -69,28 +62,23 @@
      <conditionExpression xsi:type="tFormalExpression">${status == 'INVITE'}</conditionExpression>
    </sequenceFlow>
    <sequenceFlow id="flow14" sourceRef="inviteService" targetRef="humanService" />
-    <userTask id="satisfactionSurvey" name="满意度评价" flowable:assignee="${visitorId}" flowable:formFieldValidation="true">
-      <documentation>访客填写满意度评价</documentation>
+    <serviceTask id="satisfactionService" name="满意度评价" flowable:delegateExpression="${threadSatisfactionServiceDelegate}">
+      <documentation>触发满意度评价事件</documentation>
      <extensionElements>
-        <flowable:formProperty id="threadUid" name="会话ID" type="string" required="true" />
-        <flowable:formProperty id="satisfaction" name="满意度" type="enum" required="true">
-          <flowable:value id="VERY_SATISFIED" name="非常满意" />
-          <flowable:value id="SATISFIED" name="满意" />
-          <flowable:value id="NEUTRAL" name="一般" />
-          <flowable:value id="UNSATISFIED" name="不满意" />
-          <flowable:value id="VERY_UNSATISFIED" name="非常不满意" />
-        </flowable:formProperty>
-        <flowable:formProperty id="resolved" name="问题是否解决" type="boolean" required="true" />
-        <flowable:formProperty id="comment" name="备注" type="string" />
        <flowable:executionListener event="end" delegateExpression="${threadExecutionListener}" />
-        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler">false</modeler:initiator-can-complete>
      </extensionElements>
-    </userTask>
-    <sequenceFlow id="flow15" sourceRef="humanService" targetRef="satisfactionSurvey">
+    </serviceTask>
+    <sequenceFlow id="flow15" sourceRef="humanService" targetRef="satisfactionService">
      <conditionExpression xsi:type="tFormalExpression">${status == 'RESOLVED'}</conditionExpression>
    </sequenceFlow>
+    
+    <!-- 添加人工坐席手动结束会话流程 -->
+    <sequenceFlow id="flowFinishToEnd" sourceRef="humanService" targetRef="end">
+      <conditionExpression xsi:type="tFormalExpression">${status == 'FINISHED'}</conditionExpression>
+    </sequenceFlow>
+    
    <endEvent id="end" name="会话结束" />
-    <sequenceFlow id="flow16" sourceRef="satisfactionSurvey" targetRef="end" />
+    <sequenceFlow id="flow16" sourceRef="satisfactionService" targetRef="end" />
    <sequenceFlow id="flow11" sourceRef="humanService" targetRef="transferService">
      <conditionExpression xsi:type="tFormalExpression">${status == 'TRANSFER'}</conditionExpression>
    </sequenceFlow>
@@ -152,7 +140,7 @@
      <bpmndi:BPMNShape id="BPMNShape_inviteService" bpmnElement="inviteService">
        <omgdc:Bounds x="690" y="400" width="100" height="60" />
      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_satisfactionSurvey" bpmnElement="satisfactionSurvey">
+      <bpmndi:BPMNShape id="BPMNShape_satisfactionService" bpmnElement="satisfactionService">
        <omgdc:Bounds x="680" y="300" width="100" height="60" />
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape id="BPMNShape_end" bpmnElement="end">