wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update(REQ-2516) - 完善处理事件中没有正确返回 processDefinitionKey 的问题

Browse Source
This commit is contained in:
wangli 2024-06-19 16:55:18 +08:00
parent 0aeafbc6c3
commit a8d947f0f1
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
View File

@ -36,7 +36,7 @@ public abstract class AbstractBpmnEventListener<T extends OperationContext> impl
} }
public static String parseProcessDefinitionKey(String processDefinitionId) { public static String parseProcessDefinitionKey(String processDefinitionId) {
if (StringUtils.hasText(processDefinitionId)) { if (!StringUtils.hasText(processDefinitionId)) {
return ""; return "";
} }
return processDefinitionId.split(":")[0]; return processDefinitionId.split(":")[0];

3
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java
View File

@ -25,6 +25,7 @@ import org.springframework.context.annotation.Scope;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Collections; import java.util.Collections;
@ -183,7 +184,9 @@ public class RocketMqBpmActivityEventListener extends AbstractBpmnEventListener<
return; return;
} }
Map<String, String> header = new HashMap<>(); Map<String, String> header = new HashMap<>();
if (StringUtils.hasText(dto.getProcessDefinitionKey())) {
header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey()); header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey());
}
eventProducer.send(Event.builder() eventProducer.send(Event.builder()
.shardingKey(dto.getProcessInstanceId()) .shardingKey(dto.getProcessInstanceId())
.eventCode(eventEnum.getEventCode()) .eventCode(eventEnum.getEventCode())

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
View File

@ -392,7 +392,9 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener<
return; return;
} }
Map<String, String> header = new HashMap<>(); Map<String, String> header = new HashMap<>();
if (StringUtils.hasText(dto.getProcessDefinitionKey())) {
header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey()); header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey());
}
eventProducer.send(Event.builder() eventProducer.send(Event.builder()
.shardingKey(dto.getProcessInstanceId()) .shardingKey(dto.getProcessInstanceId())
.eventCode(eventEnum.getEventCode()) .eventCode(eventEnum.getEventCode())

3
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java
View File

@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.HashMap; import java.util.HashMap;
@ -275,7 +276,9 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
return; return;
} }
Map<String, String> header = new HashMap<>(); Map<String, String> header = new HashMap<>();
if (StringUtils.hasText(dto.getProcessDefinitionKey())) {
header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey()); header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey());
}
eventProducer.send(Event.builder() eventProducer.send(Event.builder()
.shardingKey(dto.getProcessInstanceId()) .shardingKey(dto.getProcessInstanceId())
.eventCode(eventEnum.getEventCode()) .eventCode(eventEnum.getEventCode())

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java
View File

@ -137,7 +137,9 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene
return; return;
} }
Map<String, String> header = new HashMap<>(); Map<String, String> header = new HashMap<>();
if (StringUtils.hasText(dto.getProcessDefinitionKey())) {
header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey()); header.put(MQ_OWNERSHIP_PROCESS_DEFINITION_KEY, dto.getProcessDefinitionKey());
}
eventProducer.send(Event.builder() eventProducer.send(Event.builder()
.shardingKey(dto.getProcessInstanceId()) .shardingKey(dto.getProcessInstanceId())
.eventCode(eventEnum.getEventCode()) .eventCode(eventEnum.getEventCode())