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

Compare commits

base: wangli:dc442455503727f627bacbb3ea84c89974068990
Branches Tags
wangli:master
wangli:dev
wangli:feature/REQ-5965
wangli:test
wangli:feature/RDMP-3845
wangli:pre
wangli:hotfix/async_cancel
wangli:lite
wangli:feature/shardingsphere-jdbc
wangli:feature/RDMP-5834
wangli:1.3.2-u1-SNAPSHOT
wangli:dev-bak
wangli:1.5.3-SNAPSHOT
wangli:1.3.1-u1-SNAPSHOT
wangli:1.5.2-SNAPSHOT
wangli:1.5.1-u1-SNAPSHOT
wangli:1.5.0-u1-SNAPSHOT
wangli:1.3.3-u1-SNAPSHOT
wangli:feature/script_test
wangli:feature/dingtalk_robot_test
wangli:1.4.2-SNAPSHOT
wangli:1.0.9-SNAPSHOT
wangli:1.0.5-RELEASE
wangli:1.0.5-SNAPSHOT
wangli:1.0.4-RELEASE
wangli:1.0.4-SNAPSHOT
wangli:1.2.1-SNAPSHOT
wangli:1.0.3-RELEASE
wangli:1.0.3-SNAPSHOT
wangli:1.0.2-RELEASE
wangli:1.0.1-RELEASE
wangli:1.2.0-SNAPSHOT
wangli:1.0.1-SNAPSHOT
wangli:1.5.1-SNAPSHOT
wangli:1.4.1-SNAPSHOT
wangli:1.3.1-SNAPSHOT
wangli:1.3.2-SNAPSHOT
wangli:1.3.3-SNAPSHOT
wangli:1.4.0-SNAPSHOT
wangli:1.5.0-SNAPSHOT
wangli:1.3.0-SNAPSHOT
wangli:1.0.1-SNAPSHOT
..
compare: wangli:493910d2a3d025904423b56b90f758ae48bd4d60
Branches Tags
wangli:dev
wangli:feature/REQ-5965
wangli:test
wangli:feature/RDMP-3845
wangli:pre
wangli:hotfix/async_cancel
wangli:lite
wangli:master
wangli:feature/shardingsphere-jdbc
wangli:feature/RDMP-5834
wangli:1.3.2-u1-SNAPSHOT
wangli:dev-bak
wangli:1.5.3-SNAPSHOT
wangli:1.3.1-u1-SNAPSHOT
wangli:1.5.2-SNAPSHOT
wangli:1.5.1-u1-SNAPSHOT
wangli:1.5.0-u1-SNAPSHOT
wangli:1.3.3-u1-SNAPSHOT
wangli:feature/script_test
wangli:feature/dingtalk_robot_test
wangli:1.4.2-SNAPSHOT
wangli:1.0.9-SNAPSHOT
wangli:1.0.5-RELEASE
wangli:1.0.5-SNAPSHOT
wangli:1.0.4-RELEASE
wangli:1.0.4-SNAPSHOT
wangli:1.2.1-SNAPSHOT
wangli:1.0.3-RELEASE
wangli:1.0.3-SNAPSHOT
wangli:1.0.2-RELEASE
wangli:1.0.1-RELEASE
wangli:1.2.0-SNAPSHOT
wangli:1.0.1-SNAPSHOT
wangli:1.5.1-SNAPSHOT
wangli:1.4.1-SNAPSHOT
wangli:1.3.1-SNAPSHOT
wangli:1.3.2-SNAPSHOT
wangli:1.3.3-SNAPSHOT
wangli:1.4.0-SNAPSHOT
wangli:1.5.0-SNAPSHOT
wangli:1.3.0-SNAPSHOT
wangli:1.0.1-SNAPSHOT

No commits in common. "dc442455503727f627bacbb3ea84c89974068990" and "493910d2a3d025904423b56b90f758ae48bd4d60" have entirely different histories.
dc44245550 ... 493910d2a3

2 changed files with 15 additions and 14 deletions
Show Stats Expand all files Collapse all files

5
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AsyncCancelProcessInstanceJobHandler.java
View File

@ -1,5 +1,6 @@
package cn.axzo.workflow.core.engine.job;
import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCancelDTO;
import cn.axzo.workflow.common.model.request.bpmn.process.SuperBpmnProcessInstanceCancelDTO;
import cn.axzo.workflow.core.engine.cmd.CustomCancelProcessInstanceCmd;
import cn.axzo.workflow.core.service.ExtAxHiTaskInstService;
@ -33,8 +34,8 @@ public class AsyncCancelProcessInstanceJobHandler extends AbstractExecuteWithLoc
log.info("AsyncCancelProcessInstanceHandler executing...,jobInfo:{}", JSONUtil.toJsonStr(job));
log(job);
ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext);
SuperBpmnProcessInstanceCancelDTO dto = JSONUtil.toBean(job.getCustomValues(), SuperBpmnProcessInstanceCancelDTO.class);
processEngineConfiguration.getCommandExecutor().execute(new CustomCancelProcessInstanceCmd(dto, extAxHiTaskInstService));
BpmnProcessInstanceCancelDTO dto = JSONUtil.toBean(job.getCustomValues(), BpmnProcessInstanceCancelDTO.class);
processEngineConfiguration.getCommandExecutor().execute(new CustomCancelProcessInstanceCmd((SuperBpmnProcessInstanceCancelDTO) dto, extAxHiTaskInstService));
}
}

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

@ -67,7 +67,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
@Override
public void onCreated(FlowableEngineEntityEvent event) {
log.info("RocketMqBpmnProcessEventListener#onCreated..., processInstanceId: {}", event.getProcessInstanceId());
log.info("MessagePushProcessEventListener#onCreated..., processInstanceId: {}", event.getProcessInstanceId());
Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery()
.deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId()).singleResult());
Process mainProcess = getContext().getProcess(() -> repositoryService.getBpmnModel(event.getProcessDefinitionId()).getMainProcess());
@ -92,13 +92,13 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
setProcessInstanceVersion(event.getProcessInstanceId(), dto);
sendMessageQueue(dto, PROCESS_INSTANCE_CREATED);
log.info("RocketMqBpmnProcessEventListener#onCreated...end, processInstanceId: {}", event.getProcessInstanceId());
log.info("MessagePushProcessEventListener#onCreated...end, processInstanceId: {}", event.getProcessInstanceId());
}
@Override
public void onStarted(FlowableProcessStartedEvent event) {
log.info("RocketMqBpmnProcessEventListener#onStarted..., processInstanceId: {}", event.getNestedProcessInstanceId());
log.info("MessagePushProcessEventListener#onStarted..., processInstanceId: {}", event.getNestedProcessInstanceId());
Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery()
.deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId())
.singleResult());
@ -127,12 +127,12 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
setProcessInstanceVersion(((ExecutionEntityImpl) event.getEntity()).getProcessInstanceId(), dto);
sendMessageQueue(dto, PROCESS_INSTANCE_STARTED);
log.info("RocketMqBpmnProcessEventListener#onStarted...end: {}", ((ExecutionEntityImpl) event.getEntity()).getProcessInstanceId());
log.info("MessagePushProcessEventListener#onStarted...end: {}", ((ExecutionEntityImpl) event.getEntity()).getProcessInstanceId());
}
@Override
public void onCancelled(FlowableCancelledEvent event) {
log.info("RocketMqBpmnProcessEventListener#onCancelled..., processInstanceId: {}", event.getProcessInstanceId());
log.info("MessagePushProcessEventListener#onCancelled..., processInstanceId: {}", event.getProcessInstanceId());
Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery()
.deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId())
.singleResult());
@ -163,7 +163,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
setProcessDeleteReason(event, dto);
setProcessInstanceVersion(event.getProcessInstanceId(), dto);
sendMessageQueue(dto, PROCESS_INSTANCE_CANCELLED);
log.info("RocketMqBpmnProcessEventListener#onCancelled...end, processInstanceId: {}", event.getProcessInstanceId());
log.info("MessagePushProcessEventListener#onCancelled...end, processInstanceId: {}", event.getProcessInstanceId());
}
/**
@ -173,7 +173,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
*/
@Override
public void onRejected(FlowableCancelledEvent event) {
log.info("RocketMqBpmnProcessEventListener#onRejected..., processInstanceId: {}", event.getProcessInstanceId());
log.info("MessagePushProcessEventListener#onRejected..., processInstanceId: {}", event.getProcessInstanceId());
Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery()
.deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId())
.singleResult());
@ -204,12 +204,12 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
setProcessDeleteReason(event, dto);
setProcessInstanceVersion(event.getProcessInstanceId(), dto);
sendMessageQueue(dto, PROCESS_INSTANCE_REJECTED);
log.info("RocketMqBpmnProcessEventListener#onRejected...end, processInstanceId: {}", event.getProcessInstanceId());
log.info("MessagePushProcessEventListener#onRejected...end, processInstanceId: {}", event.getProcessInstanceId());
}
@Override
public void onAborted(FlowableCancelledEvent event) {
log.info("RocketMqBpmnProcessEventListener#onAborted..., processInstanceId: {}", event.getProcessInstanceId());
log.info("MessagePushProcessEventListener#onAborted..., processInstanceId: {}", event.getProcessInstanceId());
Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery()
.deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId())
.singleResult());
@ -240,12 +240,12 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
setProcessDeleteReason(event, dto);
setProcessInstanceVersion(event.getProcessInstanceId(), dto);
sendMessageQueue(dto, PROCESS_INSTANCE_ABORTED);
log.info("RocketMqBpmnProcessEventListener#onAborted...end, processInstanceId: {}.", event.getProcessInstanceId());
log.info("MessagePushProcessEventListener#onAborted...end, processInstanceId: {}.", event.getProcessInstanceId());
}
@Override
public void onCompleted(FlowableEngineEntityEvent event) {
log.info("RocketMqBpmnProcessEventListener#onCompleted...,processInstanceId: {}", event.getProcessInstanceId());
log.info("MessagePushProcessEventListener#onCompleted...,processInstanceId: {}", event.getProcessInstanceId());
Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery()
.deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId())
.singleResult());
@ -279,7 +279,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
}
dto.setWorkflowEngineVersion(version);
sendMessageQueue(dto, PROCESS_INSTANCE_COMPLETED);
log.info("RocketMqBpmnProcessEventListener#onCompleted...end,processInstanceId: {}", event.getProcessInstanceId());
log.info("MessagePushProcessEventListener#onCompleted...end,processInstanceId: {}", event.getProcessInstanceId());
}
private void setProcessDeleteReason(FlowableCancelledEvent event, ProcessInstanceDTO dto) {