From 94aab8e7a9ceeab7ddd8ade0709d517ed37e4e4e Mon Sep 17 00:00:00 2001 From: jack ning Date: Sun, 2 Feb 2025 23:55:25 +0800 Subject: [PATCH] update --- .../ticket/service/TicketDmnService.java | 11 +- .../processes/agent-ticket-process.bpmn20.xml | 223 ++++++++++++++---- .../processes/group-ticket-process.bpmn20.xml | 178 ++++++++++---- 3 files changed, 312 insertions(+), 100 deletions(-) diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/service/TicketDmnService.java b/modules/ticket/src/main/java/com/bytedesk/ticket/service/TicketDmnService.java index fe60132537..ea480319dd 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/service/TicketDmnService.java +++ b/modules/ticket/src/main/java/com/bytedesk/ticket/service/TicketDmnService.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2025-01-21 12:45:10 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-02-02 22:34:38 + * @LastEditTime: 2025-02-02 23:54:17 * @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. @@ -15,21 +15,20 @@ package com.bytedesk.ticket.service; import org.flowable.dmn.api.DmnDecisionService; import org.flowable.dmn.engine.DmnEngine; -import org.springframework.beans.factory.annotation.Autowired; -// import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -// import org.flowable.dmn.api.DmnRuleService; import com.bytedesk.ticket.ticket.TicketEntity; +import lombok.RequiredArgsConstructor; + import java.util.HashMap; import java.util.Map; @Service +@RequiredArgsConstructor public class TicketDmnService { - @Autowired - private DmnEngine dmnEngine; + private final DmnEngine dmnEngine; public void evaluateTicketPriority(TicketEntity ticket) { Map variables = new HashMap<>(); diff --git a/modules/ticket/src/main/resources/processes/agent-ticket-process.bpmn20.xml b/modules/ticket/src/main/resources/processes/agent-ticket-process.bpmn20.xml index d917194309..250271f598 100644 --- a/modules/ticket/src/main/resources/processes/agent-ticket-process.bpmn20.xml +++ b/modules/ticket/src/main/resources/processes/agent-ticket-process.bpmn20.xml @@ -1,79 +1,200 @@ - + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" + xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" + xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" + xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" + typeLanguage="http://www.w3.org/2001/XMLSchema" + expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="BytedeskTicket" + exporter="Flowable Open Source Modeler" exporterVersion="6.8.0"> - - - - - - - - - + + + + + Assigned agent handles the ticket - + - - - + + + + - - - + ${slaTime} - + - - - + flowable:class="com.bytedesk.ticket.delegate.TicketSLATimeoutNotificationDelegate"> + - - - - + flowable:class="com.bytedesk.ticket.delegate.TicketEscalateDelegate"> + + Supervisor handles escalated ticket + + + + + + + - - - - - + + + Customer verifies if the issue is resolved - - + + + - - - - + + - - - - - + + + + + - + + - - - + + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/ticket/src/main/resources/processes/group-ticket-process.bpmn20.xml b/modules/ticket/src/main/resources/processes/group-ticket-process.bpmn20.xml index 7d7350b7b0..147364e791 100644 --- a/modules/ticket/src/main/resources/processes/group-ticket-process.bpmn20.xml +++ b/modules/ticket/src/main/resources/processes/group-ticket-process.bpmn20.xml @@ -1,68 +1,160 @@ - + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" + xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" + xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" + xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" + typeLanguage="http://www.w3.org/2001/XMLSchema" + expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="BytedeskTicket" + exporter="Flowable Open Source Modeler" exporterVersion="6.8.0"> - - - - - - - - - + + + + + Group members handle the ticket - + - - - + + + - - - + ${slaTime} - + - - - - - + flowable:class="com.bytedesk.ticket.delegate.TicketSLATimeoutNotificationDelegate"> + + + Customer verifies if the issue is resolved - - + + + - - - - + + - - - - - + + + + + - + + - - - + + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file