From d029542f6161e2fd2f7e329ef244800e0fdd1819 Mon Sep 17 00:00:00 2001
From: yangyang01000846 <15195822163@163.com>
Date: Wed, 3 Dec 2025 10:55:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E5=BC=95=E6=93=8E=E6=89=A7=E8=A1=8C=E5=99=A8=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/entity/flowable/params/BaseExecuteParams.java  | 8 ++++++++
 .../sdm/common/entity/req/pbs/SubmitHpcTaskRemoteReq.java | 3 ++-
 .../sdm/flowable/delegate/handler/CloudAppHandler.java    | 2 +-
 .../sdm/flowable/delegate/handler/DataProcessHandler.java | 2 +-
 .../sdm/flowable/delegate/handler/ExecutionHandler.java   | 4 ++--
 .../delegate/handler/ExportWordScriptHandler.java         | 2 +-
 .../com/sdm/flowable/delegate/handler/HpcHandler.java     | 8 +++-----
 .../com/sdm/flowable/delegate/handler/HttpHandler.java    | 2 +-
 .../sdm/flowable/delegate/handler/LocalAppHandler.java    | 2 +-
 9 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 common/src/main/java/com/sdm/common/entity/flowable/params/BaseExecuteParams.java

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/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<CloudAppExecuteConfig> {
+public class CloudAppHandler implements ExecutionHandler<Map<String, Object>,CloudAppExecuteConfig> {
     @Override
     public void execute(DelegateExecution execution, Map<String, Object> 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<DataProcessExecuteConfig> {
+public class DataProcessHandler implements ExecutionHandler<Map<String, Object>,DataProcessExecuteConfig> {
     @Override
     public void execute(DelegateExecution execution, Map<String, Object> 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<T extends BaseExecuteConfig> {
-    void execute(DelegateExecution execution, Map<String, Object> params, T config);
+public interface ExecutionHandler<P,T extends BaseExecuteConfig> {
+    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<ExportWordScriptExecuteConfig> {
+public class ExportWordScriptHandler implements ExecutionHandler<Map<String, Object>,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<HPCExecuteConfig> {
+public class HpcHandler implements ExecutionHandler<SubmitHpcTaskRemoteReq,HPCExecuteConfig> {
 
     @Autowired
     private IAsyncTaskRecordService asyncTaskRecordService;
@@ -30,8 +28,8 @@ public class HpcHandler implements ExecutionHandler<HPCExecuteConfig> {
     private ITaskFeignClient taskFeignClient;
 
     @Override
-    public void execute(DelegateExecution execution, Map<String, Object> 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<HttpExecuteConfig> {
+public class HttpHandler implements ExecutionHandler<Map<String, Object>,HttpExecuteConfig> {
 
     @Override
     public void execute(DelegateExecution execution, Map<String, Object> 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<LocalAppExecuteConfig> {
+public class LocalAppHandler implements ExecutionHandler<Map<String, Object>,LocalAppExecuteConfig> {
     @Override
     public void execute(DelegateExecution execution, Map<String, Object> params, LocalAppExecuteConfig config) {
         // 实现本地应用处理逻辑...