修改类名

flow-common/flow-common-flowable-starter/src/main/java/com/flow/flowable/cmd/AddMultiInstanceExecutionCmd.java → flow-common/flow-common-flowable-starter/src/main/java/com/flow/flowable/cmd/AddTaskExecutionCmd.java

@@ -16,12 +16,12 @@ import java.util.Map;
 import java.util.Objects;
 
 
-public class AddMultiInstanceExecutionCmd implements Command<Void> {
+public class AddTaskExecutionCmd implements Command<Void> {
     protected String processInstanceId;
     protected String activityId;
     protected String assignee;
 
-    public AddMultiInstanceExecutionCmd(String processInstanceId, String activityId, String assignee) {
+    public AddTaskExecutionCmd(String processInstanceId, String activityId, String assignee) {
         this.processInstanceId = processInstanceId;
         this.activityId = activityId;
         this.assignee = assignee;

flow-common/flow-common-flowable-starter/src/main/java/com/flow/flowable/cmd/DeleteMultiInstanceExecutionCmd.java → flow-common/flow-common-flowable-starter/src/main/java/com/flow/flowable/cmd/DeleteTaskExecutionCmd.java

@@ -15,12 +15,12 @@ import org.flowable.task.api.Task;
 import java.util.List;
 import java.util.Objects;
 
-public class DeleteMultiInstanceExecutionCmd implements Command<Void> {
+public class DeleteTaskExecutionCmd implements Command<Void> {
     protected String processInstanceId;
     protected String activityId;
     protected String assignee;
 
-    public DeleteMultiInstanceExecutionCmd(String processInstanceId, String activityId, String assignee) {
+    public DeleteTaskExecutionCmd(String processInstanceId, String activityId, String assignee) {
         this.processInstanceId = processInstanceId;
         this.activityId = activityId;
         this.assignee = assignee;

flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowTaskServiceImpl.java

@@ -17,8 +17,8 @@ import com.flow.entity.node.FieldProperty;
 import com.flow.entity.node.Node;
 import com.flow.entity.node.StartNode;
 import com.flow.enums.ProcessStatus;
-import com.flow.flowable.cmd.AddMultiInstanceExecutionCmd;
-import com.flow.flowable.cmd.DeleteMultiInstanceExecutionCmd;
+import com.flow.flowable.cmd.AddTaskExecutionCmd;
+import com.flow.flowable.cmd.DeleteTaskExecutionCmd;
 import com.flow.flowable.cmd.JumpActivityCmd;
 import com.flow.flowable.utils.ProcessElementUtil;
 import com.flow.model.*;
@@ -242,7 +242,7 @@ public class FlowTaskServiceImpl extends BaseServiceImpl<FlowTaskDao, FlowTask>
     @Override
     public void addSign(AddSignTaskForm taskForm) {
         Task taskInfo = this.comment(taskForm);
-        managementService.executeCommand(new AddMultiInstanceExecutionCmd(
+        managementService.executeCommand(new AddTaskExecutionCmd(
                 taskInfo.getProcessInstanceId(),
                 taskInfo.getTaskDefinitionKey(),
                 taskForm.getAssignee())
@@ -253,7 +253,7 @@ public class FlowTaskServiceImpl extends BaseServiceImpl<FlowTaskDao, FlowTask>
     @Override
     public void removeSign(AddSignTaskForm taskForm) {
         Task taskInfo = this.comment(taskForm);
-        managementService.executeCommand(new DeleteMultiInstanceExecutionCmd(
+        managementService.executeCommand(new DeleteTaskExecutionCmd(
                 taskInfo.getProcessInstanceId(),
                 taskInfo.getTaskDefinitionKey(),
                 taskInfo.getAssignee()

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/HttpNode.java

@@ -35,8 +35,22 @@ public class HttpNode extends Node {
         httpServiceTask.setExecutionListeners(this.buidEventListener());
         // httpServiceTask.setAsynchronous(true);
         // httpServiceTask.setParallelInSameTransaction(true);
-        // httpServiceTask.setImplementationType(ImplementationType.IMPLEMENTATION_TYPE_DELEGATEEXPRESSION);
-        // httpServiceTask.setImplementation("${httpDelegate}");
+        // 失败重试
+        boolean isRetry = Objects.nonNull(this.retryCount) && this.retryCount > 0;
+        if (isRetry) {
+            StringBuilder retry = new StringBuilder();
+            retry.append(String.format("R%s", this.retryCount));
+            if (Objects.nonNull(this.duration)) {
+                retry.append("/")
+                        .append(String.format(this.unit.getUnit(), this.duration));
+                ExtensionElement retryElement = new ExtensionElement();
+                retryElement.setNamespace("https://flowable.org/model");
+                retryElement.setNamespacePrefix("flowable");
+                retryElement.setName("failedJobRetryTimeCycle");
+                retryElement.setElementText(retry.toString());
+                httpServiceTask.addExtensionElement(retryElement);
+            }
+        }
         // 请求参数
         ArrayList<FieldExtension> fieldExtensions = new ArrayList<>();
         FieldExtension urlExtension = new FieldExtension();
@@ -80,26 +94,10 @@ public class HttpNode extends Node {
         activityBehaviorExtension.setStringValue("com.flow.behavior.CustomHttpServiceTaskActivityBehavior");
         fieldExtensions.add(activityBehaviorExtension);
         httpServiceTask.setFieldExtensions(fieldExtensions);
-        // 失败重试
-        boolean isRetry = Objects.nonNull(this.retryCount) && this.retryCount > 0;
         FieldExtension ignoreExtension = new FieldExtension();
         ignoreExtension.setFieldName("ignoreException");
         ignoreExtension.setStringValue(Boolean.toString(isRetry));
         fieldExtensions.add(ignoreExtension);
-        if (isRetry) {
-            StringBuilder retry = new StringBuilder();
-            retry.append(String.format("R%s", this.retryCount));
-            if (Objects.nonNull(this.duration)) {
-                retry.append("/")
-                        .append(String.format(this.unit.getUnit(), this.duration));
-                ExtensionElement retryElement = new ExtensionElement();
-                retryElement.setNamespace("https://flowable.org/model");
-                retryElement.setNamespacePrefix("flowable");
-                retryElement.setName("failedJobRetryTimeCycle");
-                retryElement.setElementText(retry.toString());
-                httpServiceTask.addExtensionElement(retryElement);
-            }
-        }
         elements.add(httpServiceTask);
         // 下一个节点的连线
         Node child = this.getChild();