update - 在发送待办时,透传用于查询能用按钮的前置数据

workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/helper/CustomTaskHelper.java

@@ -86,9 +86,13 @@ public class CustomTaskHelper {
     }
 
     private static void setParentTaskId(TaskEntity originTask, Execution subExecution) {
-        CommandContextUtil.getEntityCache().findInCache(TaskEntity.class).stream().filter(i -> Objects.equals(i.getExecutionId(), subExecution.getId())).findAny().ifPresent(i -> i.setParentTaskId(originTask.getId()));
+        CommandContextUtil.getEntityCache().findInCache(TaskEntity.class).stream()
+                .filter(i -> Objects.equals(i.getExecutionId(), subExecution.getId()))
+                .findAny().ifPresent(i -> i.setParentTaskId(originTask.getId()));
 
-        CommandContextUtil.getEntityCache().findInCache(HistoricTaskInstanceEntity.class).stream().filter(i -> Objects.equals(i.getExecutionId(), subExecution.getId())).findAny().ifPresent(i -> i.setParentTaskId(originTask.getId()));
+        CommandContextUtil.getEntityCache().findInCache(HistoricTaskInstanceEntity.class).stream()
+                .filter(i -> Objects.equals(i.getExecutionId(), subExecution.getId()))
+                .findAny().ifPresent(i -> i.setParentTaskId(originTask.getId()));
     }
 
     /**

workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/MessagePushEvent.java

@@ -20,6 +20,10 @@ public interface MessagePushEvent extends FlowableEvent {
 
     String getProcessInstanceId();
 
+    String getProcessDefinitionKey();
+
+    String getCurrentTaskDefinitionKey();
+
     String getTenantId();
 
     String getTaskId();

workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/MessagePushEventBuilder.java

@@ -53,9 +53,10 @@ public class MessagePushEventBuilder {
 
     public static MessagePushEventImpl createPendingPushEvent(List<BpmnTaskDelegateAssigner> assigners,
                                                               BpmnNoticeConf noticeConf, String processInstanceId,
+                                                              String processDefinitionId, String currentTaskDefinitionKey,
                                                               String tenantId, String taskId) {
         MessagePushEventImpl newEvent = new MessagePushEventImpl(PENDING_PUSH, assigners, noticeConf, processInstanceId,
-                tenantId, taskId);
+                processDefinitionId, currentTaskDefinitionKey, tenantId, taskId);
         return newEvent;
     }
 

workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/MessagePushEventImpl.java

@@ -19,6 +19,8 @@ public class MessagePushEventImpl implements MessagePushEvent {
     private List<BpmnTaskDelegateAssigner> assigners;
     private BpmnNoticeConf noticeConfig;
     private String processInstanceId;
+    private String processDefinitionId;
+    private String currentTaskDefinitionKey;
     private String tenantId;
     private String taskId;
 
@@ -35,14 +37,13 @@ public class MessagePushEventImpl implements MessagePushEvent {
      * 该对象的消费场景会对 taskId 做条件判断
      *
      * @param type
-     * @param assigner
+     * @param assigners
      * @param noticeConfig
      * @param processInstanceId
      * @param tenantId
      * @param taskId
      */
-    public MessagePushEventImpl(FlowableEventType type, List<BpmnTaskDelegateAssigner> assigners,
+    public MessagePushEventImpl(FlowableEventType type, List<BpmnTaskDelegateAssigner> assigners, BpmnNoticeConf noticeConfig, String processInstanceId, String tenantId, String taskId) {
-                                BpmnNoticeConf noticeConfig, String processInstanceId, String tenantId, String taskId) {
         this.type = type;
         this.assigners = assigners;
         this.noticeConfig = noticeConfig;
@@ -51,6 +52,33 @@ public class MessagePushEventImpl implements MessagePushEvent {
         this.taskId = taskId;
     }
 
+    /**
+     * 使用该对象时需遵守,如果是 task 级的,一定要传 taskId, 其他参数则都是必传
+     * <p>
+     * 该对象的消费场景会对 taskId 做条件判断
+     *
+     * @param type
+     * @param assigners
+     * @param noticeConfig
+     * @param processInstanceId
+     * @param processDefinitionId
+     * @param currentTaskDefinitionKey
+     * @param tenantId
+     * @param taskId
+     */
+    public MessagePushEventImpl(FlowableEventType type, List<BpmnTaskDelegateAssigner> assigners,
+                                BpmnNoticeConf noticeConfig, String processInstanceId, String processDefinitionId,
+                                String currentTaskDefinitionKey, String tenantId, String taskId) {
+        this.type = type;
+        this.assigners = assigners;
+        this.noticeConfig = noticeConfig;
+        this.processInstanceId = processInstanceId;
+        this.processDefinitionId = processDefinitionId;
+        this.currentTaskDefinitionKey = currentTaskDefinitionKey;
+        this.tenantId = tenantId;
+        this.taskId = taskId;
+    }
+
     @Override
     public FlowableEventType getType() {
         return type;
@@ -83,10 +111,32 @@ public class MessagePushEventImpl implements MessagePushEvent {
         return processInstanceId;
     }
 
+    @Override
+    public String getProcessDefinitionKey() {
+        return "";
+    }
+
     public void setProcessInstanceId(String processInstanceId) {
         this.processInstanceId = processInstanceId;
     }
 
+    public String getProcessDefinitionId() {
+        return processDefinitionId;
+    }
+
+    public void setProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+    }
+
+    @Override
+    public String getCurrentTaskDefinitionKey() {
+        return currentTaskDefinitionKey;
+    }
+
+    public void setCurrentTaskDefinitionKey(String currentTaskDefinitionKey) {
+        this.currentTaskDefinitionKey = currentTaskDefinitionKey;
+    }
+
     @Override
     public String getTenantId() {
         return tenantId;

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

@@ -144,6 +144,7 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener<
                     JSONUtil.toJsonStr(event.getAssigners()));
         }
         if (Objects.nonNull(event.getNoticeConfig().getPending())) {
+            // TODO 发送待办时, 计算当前人能操作的按钮有哪些?
             MessagePushDTO dto = build(event.getNoticeConfig().getPending().getPendingMessageId(),
                     PROCESS_PUSH_PENDING, event, collectionVariable(event));
             sendMessageQueue(dto, PROCESS_PUSH_PENDING);

workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/MessagePushTaskEvent_103_Listener.java

@@ -152,8 +152,9 @@ public class MessagePushTaskEvent_103_Listener extends AbstractBpmnEventListener
             assigners.stream().filter(i -> Objects.equals(delegateTask.getAssignee(), i.buildAssigneeId())).findAny()
                     .ifPresent(i -> {
                         MessagePushEventImpl event =
-                                MessagePushEventBuilder.createEvent(MessagePushEventType.PENDING_PUSH,
+                                MessagePushEventBuilder.createPendingPushEvent(Lists.newArrayList(i),
-                                        Lists.newArrayList(i), noticeConf, processInstance.getProcessInstanceId(),
+                                        noticeConf, processInstance.getProcessInstanceId(),
+                                        processInstance.getProcessDefinitionId(), userTask.getId(),
                                         processInstance.getTenantId(), delegateTask.getId());
                         if (log.isDebugEnabled()) {
                             log.debug("发送推送待办的消息: {}", JSONUtil.toJsonStr(event));