diff --git a/common/src/main/java/com/sdm/common/entity/flowable/params/BaseExecuteParams.java b/common/src/main/java/com/sdm/common/entity/flowable/params/BaseExecuteParams.java new file mode 100644 index 00000000..95f29bee --- /dev/null +++ b/common/src/main/java/com/sdm/common/entity/flowable/params/BaseExecuteParams.java @@ -0,0 +1,8 @@ +package com.sdm.common.entity.flowable.params; + +import lombok.Data; + +@Data +public class BaseExecuteParams { + +} diff --git a/common/src/main/java/com/sdm/common/entity/req/pbs/SubmitHpcTaskRemoteReq.java b/common/src/main/java/com/sdm/common/entity/req/pbs/SubmitHpcTaskRemoteReq.java index 54e515da..8ab9c0b1 100644 --- a/common/src/main/java/com/sdm/common/entity/req/pbs/SubmitHpcTaskRemoteReq.java +++ b/common/src/main/java/com/sdm/common/entity/req/pbs/SubmitHpcTaskRemoteReq.java @@ -1,5 +1,6 @@ package com.sdm.common.entity.req.pbs; +import com.sdm.common.entity.flowable.executeConfig.BaseExecuteConfig; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -8,7 +9,7 @@ import java.util.List; import java.util.Map; @Data -public class SubmitHpcTaskRemoteReq { +public class SubmitHpcTaskRemoteReq extends BaseExecuteConfig { @Schema(description = "计算任务名称") public String jobName; diff --git a/flowable/jsonTemplate/网关串并行+人工节点+异步回调混合流程.json b/flowable/jsonTemplate/网关串并行+人工节点+异步回调混合流程.json index c214e787..282e5fc8 100644 --- a/flowable/jsonTemplate/网关串并行+人工节点+异步回调混合流程.json +++ b/flowable/jsonTemplate/网关串并行+人工节点+异步回调混合流程.json @@ -21,7 +21,7 @@ "executeType": "HPC", "asyncCallback": true, "waitUser":true, - "beforeNodeId": false + "beforeNodeId": "start" } } }, diff --git a/flowable/src/main/java/com/sdm/flowable/delegate/handler/CloudAppHandler.java b/flowable/src/main/java/com/sdm/flowable/delegate/handler/CloudAppHandler.java index a4439960..1e0e6338 100644 --- a/flowable/src/main/java/com/sdm/flowable/delegate/handler/CloudAppHandler.java +++ b/flowable/src/main/java/com/sdm/flowable/delegate/handler/CloudAppHandler.java @@ -8,7 +8,7 @@ import java.util.Map; // 云应用处理器(executeType=cloudApp) @Component("cloudApp") -public class CloudAppHandler implements ExecutionHandler { +public class CloudAppHandler implements ExecutionHandler,CloudAppExecuteConfig> { @Override public void execute(DelegateExecution execution, Map params, CloudAppExecuteConfig config) { // 实现云应用处理逻辑... diff --git a/flowable/src/main/java/com/sdm/flowable/delegate/handler/DataProcessHandler.java b/flowable/src/main/java/com/sdm/flowable/delegate/handler/DataProcessHandler.java index fc398d06..5b9d4e13 100644 --- a/flowable/src/main/java/com/sdm/flowable/delegate/handler/DataProcessHandler.java +++ b/flowable/src/main/java/com/sdm/flowable/delegate/handler/DataProcessHandler.java @@ -9,7 +9,7 @@ import java.util.Map; // 数据处理执行器(executeType=data_process) @Component("dataProcess") -public class DataProcessHandler implements ExecutionHandler { +public class DataProcessHandler implements ExecutionHandler,DataProcessExecuteConfig> { @Override public void execute(DelegateExecution execution, Map params, DataProcessExecuteConfig config) { // 实现数据处理逻辑... diff --git a/flowable/src/main/java/com/sdm/flowable/delegate/handler/ExecutionHandler.java b/flowable/src/main/java/com/sdm/flowable/delegate/handler/ExecutionHandler.java index b4fc91bb..49649bdc 100644 --- a/flowable/src/main/java/com/sdm/flowable/delegate/handler/ExecutionHandler.java +++ b/flowable/src/main/java/com/sdm/flowable/delegate/handler/ExecutionHandler.java @@ -5,6 +5,6 @@ import org.flowable.engine.delegate.DelegateExecution; import java.util.Map; -public interface ExecutionHandler { - void execute(DelegateExecution execution, Map params, T config); +public interface ExecutionHandler { + void execute(DelegateExecution execution, P params, T config); } diff --git a/flowable/src/main/java/com/sdm/flowable/delegate/handler/ExportWordScriptHandler.java b/flowable/src/main/java/com/sdm/flowable/delegate/handler/ExportWordScriptHandler.java index d5e774aa..bec7bcac 100644 --- a/flowable/src/main/java/com/sdm/flowable/delegate/handler/ExportWordScriptHandler.java +++ b/flowable/src/main/java/com/sdm/flowable/delegate/handler/ExportWordScriptHandler.java @@ -25,7 +25,7 @@ import java.util.Map; */ @Slf4j @Component("exportWordScript") -public class ExportWordScriptHandler implements ExecutionHandler { +public class ExportWordScriptHandler implements ExecutionHandler,ExportWordScriptExecuteConfig> { @Autowired private IDataFeignClient dataFeignClient; diff --git a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java index 69e8d1b8..1293a662 100644 --- a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java +++ b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java @@ -4,7 +4,6 @@ import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.flowable.executeConfig.HPCExecuteConfig; import com.sdm.common.entity.req.pbs.SubmitHpcTaskRemoteReq; import com.sdm.common.feign.inter.pbs.ITaskFeignClient; -import com.sdm.common.entity.flowable.executeConfig.BaseExecuteConfig; import com.sdm.flowable.service.IAsyncTaskRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -16,12 +15,11 @@ import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; import java.util.HashMap; -import java.util.Map; // HPC(executeType=HPC) @Slf4j @Component("HPC") -public class HpcHandler implements ExecutionHandler { +public class HpcHandler implements ExecutionHandler { @Autowired private IAsyncTaskRecordService asyncTaskRecordService; @@ -30,8 +28,8 @@ public class HpcHandler implements ExecutionHandler { private ITaskFeignClient taskFeignClient; @Override - public void execute(DelegateExecution execution, Map params, HPCExecuteConfig config) { - + public void execute(DelegateExecution execution, SubmitHpcTaskRemoteReq params, HPCExecuteConfig config) { + String beforeNodeId = config.getBeforeNodeId(); // 实现HPC处理逻辑... // INIT(初始化)/RUNNING(执行中)/SUCCESS(执行成功)/FAIL(执行失败) String status = "INIT"; diff --git a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HttpHandler.java b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HttpHandler.java index 6a1254ca..1b05307a 100644 --- a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HttpHandler.java +++ b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HttpHandler.java @@ -9,7 +9,7 @@ import java.util.Map; // HTTP请求执行器(executeType=HTTP) @Component("http") -public class HttpHandler implements ExecutionHandler { +public class HttpHandler implements ExecutionHandler,HttpExecuteConfig> { @Override public void execute(DelegateExecution execution, Map params, HttpExecuteConfig config) { diff --git a/flowable/src/main/java/com/sdm/flowable/delegate/handler/LocalAppHandler.java b/flowable/src/main/java/com/sdm/flowable/delegate/handler/LocalAppHandler.java index 4ab30fd1..8dd76a2d 100644 --- a/flowable/src/main/java/com/sdm/flowable/delegate/handler/LocalAppHandler.java +++ b/flowable/src/main/java/com/sdm/flowable/delegate/handler/LocalAppHandler.java @@ -8,7 +8,7 @@ import java.util.Map; // 本地应用处理器(executeType=localApp) @Component("localApp") -public class LocalAppHandler implements ExecutionHandler { +public class LocalAppHandler implements ExecutionHandler,LocalAppExecuteConfig> { @Override public void execute(DelegateExecution execution, Map params, LocalAppExecuteConfig config) { // 实现本地应用处理逻辑...