From d8217c808ebdd0d8317be51d9879e1cff3088de7 Mon Sep 17 00:00:00 2001 From: jack ning Date: Fri, 4 Apr 2025 10:33:59 +0800 Subject: [PATCH] update --- ...r.java => ThreadProcessEventListener.java} | 4 +- .../delegate/ThreadCompletionDelegate.java | 4 +- .../delegate/ThreadHumanServiceDelegate.java | 2 +- .../delegate/ThreadInitializeDelegate.java | 2 +- .../delegate/ThreadQueueServiceDelegate.java | 2 +- ...ThreadRobotIdleTimeoutServiceDelegate.java | 2 +- .../delegate/ThreadRobotServiceDelegate.java | 2 +- .../ThreadSLATimeoutNotificationDelegate.java | 2 +- .../ThreadSatisfactionServiceDelegate.java} | 10 ++--- .../ThreadTransferServiceDelegate.java | 2 +- .../delegate/TicketAutoCloseDelegate.java | 2 +- .../delegate/TicketCloseDelegate.java | 2 +- .../delegate/TicketEscalateDelegate.java | 2 +- .../TicketEvaluatePriorityDelegate.java | 2 +- .../delegate/TicketMessageDelegate.java | 2 +- .../TicketSLATimeoutNotificationDelegate.java | 2 +- .../processes/thread-process.bpmn20.xml | 38 +++++++------------ 17 files changed, 35 insertions(+), 47 deletions(-) rename modules/ticket/src/main/java/com/bytedesk/ticket/thread/{TicketThreadEventListener.java => ThreadProcessEventListener.java} (98%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => thread}/delegate/ThreadCompletionDelegate.java (99%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => thread}/delegate/ThreadHumanServiceDelegate.java (99%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => thread}/delegate/ThreadInitializeDelegate.java (99%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => thread}/delegate/ThreadQueueServiceDelegate.java (98%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => thread}/delegate/ThreadRobotIdleTimeoutServiceDelegate.java (99%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => thread}/delegate/ThreadRobotServiceDelegate.java (98%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => thread}/delegate/ThreadSLATimeoutNotificationDelegate.java (99%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{delegate/ThreadSatisfactionDelegate.java => thread/delegate/ThreadSatisfactionServiceDelegate.java} (97%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => thread}/delegate/ThreadTransferServiceDelegate.java (99%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => ticket}/delegate/TicketAutoCloseDelegate.java (96%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => ticket}/delegate/TicketCloseDelegate.java (97%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => ticket}/delegate/TicketEscalateDelegate.java (98%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => ticket}/delegate/TicketEvaluatePriorityDelegate.java (98%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => ticket}/delegate/TicketMessageDelegate.java (97%) rename modules/ticket/src/main/java/com/bytedesk/ticket/{ => ticket}/delegate/TicketSLATimeoutNotificationDelegate.java (97%) diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/thread/TicketThreadEventListener.java b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/ThreadProcessEventListener.java similarity index 98% rename from modules/ticket/src/main/java/com/bytedesk/ticket/thread/TicketThreadEventListener.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/thread/ThreadProcessEventListener.java index 866ca58ea6..2a911870dd 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/thread/TicketThreadEventListener.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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadCompletionDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadCompletionDelegate.java similarity index 99% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadCompletionDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadCompletionDelegate.java index 9fde5cff60..2a6e161b69 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadHumanServiceDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadHumanServiceDelegate.java similarity index 99% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadHumanServiceDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadHumanServiceDelegate.java index 60204e5b79..63ae75fc5d 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadInitializeDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadInitializeDelegate.java similarity index 99% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadInitializeDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadInitializeDelegate.java index 55612e362e..31f1e33d8f 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadQueueServiceDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadQueueServiceDelegate.java similarity index 98% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadQueueServiceDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadQueueServiceDelegate.java index d81e2e3832..094c8a96fa 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadRobotIdleTimeoutServiceDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadRobotIdleTimeoutServiceDelegate.java similarity index 99% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadRobotIdleTimeoutServiceDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadRobotIdleTimeoutServiceDelegate.java index fadd69b448..5bb1964857 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadRobotServiceDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadRobotServiceDelegate.java similarity index 98% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadRobotServiceDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadRobotServiceDelegate.java index 8cfc71dca3..bf8a2551d2 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadSLATimeoutNotificationDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadSLATimeoutNotificationDelegate.java similarity index 99% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadSLATimeoutNotificationDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadSLATimeoutNotificationDelegate.java index 55be6487bd..eb968a5045 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadSatisfactionDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadSatisfactionServiceDelegate.java similarity index 97% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadSatisfactionDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadSatisfactionServiceDelegate.java index 634442c649..55c36b5708 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadSatisfactionDelegate.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); } -} \ No newline at end of file +} \ No newline at end of file diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadTransferServiceDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadTransferServiceDelegate.java similarity index 99% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/ThreadTransferServiceDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/thread/delegate/ThreadTransferServiceDelegate.java index c3641a7686..5cd25d7c17 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/TicketAutoCloseDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketAutoCloseDelegate.java similarity index 96% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/TicketAutoCloseDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketAutoCloseDelegate.java index bb2dba54e3..cad58c15ab 100644 --- a/modules/ticket/src/main/java/com/bytedesk/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/TicketCloseDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketCloseDelegate.java similarity index 97% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/TicketCloseDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketCloseDelegate.java index a9ce6443e2..89d998ef65 100644 --- a/modules/ticket/src/main/java/com/bytedesk/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/TicketEscalateDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketEscalateDelegate.java similarity index 98% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/TicketEscalateDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketEscalateDelegate.java index cfaf868d3f..f776d323e9 100644 --- a/modules/ticket/src/main/java/com/bytedesk/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/TicketEvaluatePriorityDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketEvaluatePriorityDelegate.java similarity index 98% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/TicketEvaluatePriorityDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketEvaluatePriorityDelegate.java index 937b2aca9c..59ec7fdae0 100644 --- a/modules/ticket/src/main/java/com/bytedesk/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/TicketMessageDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketMessageDelegate.java similarity index 97% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/TicketMessageDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketMessageDelegate.java index ab79fa6059..cd884487eb 100644 --- a/modules/ticket/src/main/java/com/bytedesk/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; diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/delegate/TicketSLATimeoutNotificationDelegate.java b/modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketSLATimeoutNotificationDelegate.java similarity index 97% rename from modules/ticket/src/main/java/com/bytedesk/ticket/delegate/TicketSLATimeoutNotificationDelegate.java rename to modules/ticket/src/main/java/com/bytedesk/ticket/ticket/delegate/TicketSLATimeoutNotificationDelegate.java index fc97223006..e3fd13f7dc 100644 --- a/modules/ticket/src/main/java/com/bytedesk/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; diff --git a/modules/ticket/src/main/resources/processes/thread-process.bpmn20.xml b/modules/ticket/src/main/resources/processes/thread-process.bpmn20.xml index 56a6729517..1a14dcc27b 100644 --- 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 @@ ${agentsBusy == true} - 客服人员接待访客 + 客服人员接待访客，流程外处理流转和协助 - - - - - - - @@ -69,28 +62,23 @@ ${status == 'INVITE'} - - 访客填写满意度评价 + + 触发满意度评价事件 - - - - - - - - - - - false - - + + ${status == 'RESOLVED'} + + + + ${status == 'FINISHED'} + + - + ${status == 'TRANSFER'} @@ -152,7 +140,7 @@ - +