修改为连接器

flow-workflow/flow-workflow-entity/src/main/java/com/flow/constant/NodeTypeConstant.java

@@ -37,4 +37,6 @@ public interface NodeTypeConstant {
     String CALL = "call";
     // 外部任务
     String EXTERNAL = "external";
+    // 连接器
+    String CONNECTOR = "connector";
 }

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/TriggerNode.java → flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/ConnectorNode.java

@@ -1,7 +1,7 @@
 package com.flow.entity.node;
 
 import com.flow.common.core.exception.BaseException;
-import com.flow.entity.node.trigger.Trigger;
+import com.flow.entity.node.connector.Connector;
 import com.google.common.collect.Lists;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,8 +15,8 @@ import java.util.Objects;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class TriggerNode extends Node {
-    private Trigger trigger;
+public class ConnectorNode extends Node {
+    private Connector connector;
 
     @Override
     public List<FlowElement> convert() {
@@ -26,10 +26,10 @@ public class TriggerNode extends Node {
         serviceTask.setId(this.getId());
         serviceTask.setName(this.getName());
         serviceTask.setExecutionListeners(this.buidEventListener());
-        if(Objects.isNull(this.trigger)){
-            throw new BaseException("触发器不能为空");
+        if(Objects.isNull(this.connector)){
+            throw new BaseException("连接器不能为空");
         }
-        this.trigger.initImpl(serviceTask);
+        this.connector.initImpl(serviceTask);
         elements.add(serviceTask);
         // 下一个节点的连线
         Node next = this.getNext();

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

@@ -38,6 +38,7 @@ import java.util.stream.Collectors;
         @JsonSubTypes.Type(value = SubNode.class, name = NodeTypeConstant.SUB),
         @JsonSubTypes.Type(value = CallNode.class, name = NodeTypeConstant.CALL),
         @JsonSubTypes.Type(value = ExternalNode.class, name = NodeTypeConstant.EXTERNAL),
+        @JsonSubTypes.Type(value = ConnectorNode.class, name = NodeTypeConstant.CONNECTOR),
         @JsonSubTypes.Type(value = EndNode.class, name = NodeTypeConstant.END)
 })
 @JsonIgnoreProperties(ignoreUnknown = true)

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/trigger/ClassTrigger.java → flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/connector/ClassConnector.java

@@ -1,4 +1,4 @@
-package com.flow.entity.node.trigger;
+package com.flow.entity.node.connector;
 
 import com.flow.flowable.utils.ProcessElementUtil;
 import lombok.Data;
@@ -9,7 +9,7 @@ import java.util.Map;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class ClassTrigger extends Trigger {
+public class ClassConnector extends Connector {
     private String implementationType;
     private String implementation;
     private Map<String, String> params;

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/connector/Connector.java

@@ -0,0 +1,21 @@
+package com.flow.entity.node.connector;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.Data;
+import org.flowable.bpmn.model.ServiceTask;
+
+@Data
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = Connector.class, visible = true)
+@JsonSubTypes({
+        @JsonSubTypes.Type(value = MqConnector.class, name = "mq"),
+        @JsonSubTypes.Type(value = HttpConnector.class, name = "http"),
+        @JsonSubTypes.Type(value = MicroConnector.class, name = "micro"),
+        @JsonSubTypes.Type(value = ClassConnector.class, name = "class")
+})
+public abstract class Connector {
+    private String id;
+    private ConnectorType type;
+
+    public abstract void initImpl(ServiceTask serviceTask);
+}

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/trigger/TriggerType.java → flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/connector/ConnectorType.java

@@ -1,4 +1,4 @@
-package com.flow.entity.node.trigger;
+package com.flow.entity.node.connector;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.AllArgsConstructor;
@@ -6,7 +6,7 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public enum TriggerType {
+public enum ConnectorType {
     MQ("mq", "消息队列"),
     MICRO("micro", "微服务"),
     CLASS("class", "类"),

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/trigger/HttpTrigger.java → flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/connector/HttpConnector.java

@@ -1,4 +1,4 @@
-package com.flow.entity.node.trigger;
+package com.flow.entity.node.connector;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -14,7 +14,7 @@ import java.util.Map;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class HttpTrigger extends Trigger {
+public class HttpConnector extends Connector {
     private String url;
     private String method;
     private Map<String, Object> headers;

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/trigger/MicroTrigger.java → flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/connector/MicroConnector.java

@@ -1,4 +1,4 @@
-package com.flow.entity.node.trigger;
+package com.flow.entity.node.connector;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -14,7 +14,7 @@ import java.util.Map;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class MicroTrigger extends Trigger {
+public class MicroConnector extends Connector {
     private String url;
     private String method;
     private Map<String, Object> headers;

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/trigger/MqTrigger.java → flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/connector/MqConnector.java

@@ -1,4 +1,4 @@
-package com.flow.entity.node.trigger;
+package com.flow.entity.node.connector;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -14,7 +14,7 @@ import java.util.Map;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class MqTrigger extends Trigger {
+public class MqConnector extends Connector {
     private String queue;
     protected Map<String, Object> params;
 

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/trigger/Trigger.java

@@ -1,20 +0,0 @@
-package com.flow.entity.node.trigger;
-
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import lombok.Data;
-import org.flowable.bpmn.model.ServiceTask;
-
-@Data
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = Trigger.class, visible = true)
-@JsonSubTypes({
-        @JsonSubTypes.Type(value = MqTrigger.class, name = "mq"),
-        @JsonSubTypes.Type(value = HttpTrigger.class, name = "http"),
-        @JsonSubTypes.Type(value = MicroTrigger.class, name = "micro"),
-        @JsonSubTypes.Type(value = ClassTrigger.class, name = "class")
-})
-public abstract class Trigger {
-    private TriggerType type;
-
-    public abstract void initImpl(ServiceTask serviceTask);
-}