toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改：HPC优化

Browse Source
This commit is contained in:
yangyang01000846
2025-12-05 18:09:41 +08:00
parent 9b48988af8
commit 220a126a7b
10 changed files with 160 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/java/com/sdm/common/entity/flowable/executeConfig/HPCExecuteConfig.java
View File

@@ -5,7 +5,6 @@ import lombok.Data;
@Data
public class HPCExecuteConfig extends BaseExecuteConfig {
private String currentNodeId;
private String beforeNodeId;
// 先默认写死一个，后面前端配置传递
private String masterFileRegularStr="^aa\\.xml$";

16
common/src/main/java/com/sdm/common/entity/req/pbs/SubmitHpcTaskRemoteReq.java
View File

@@ -58,4 +58,20 @@ public class SubmitHpcTaskRemoteReq {
@Schema(description = "任务所属项目")
public String projectname;
@Schema(description = "计算任务回传minio的路径")
public String stdoutSpdmMinoFilePath;
@Schema(description = "任务回传本地Nas的路径")
public String stdoutSpdmNasFilePath;
@Schema(description = "任务求解文件本地路径,spdm工作流引擎会传递过来，adapter里使用")
public String simulationFileLocalPath;
@Schema(description = "任务求解文件主文件正则,spdm工作流引擎会传递过来，adapter里使用")
public String masterFileRegularStr;
@Schema(description = "任务求解文件从文件正则,spdm工作流引擎会传递过来，adapter里使用")
public String inputFilesRegularStr;
}

4
common/src/main/java/com/sdm/common/feign/impl/pbs/TaskClientFeignClientImpl.java
View File

@@ -16,10 +16,10 @@ public class TaskClientFeignClientImpl implements ITaskFeignClient {
private ITaskFeignClient taskFeignClient;
@Override
public SdmResponse<String> submitHpcJob(SubmitHpcTaskRemoteReq req) {
public SdmResponse<String> adapterSubmitHpcJob(SubmitHpcTaskRemoteReq req) {
SdmResponse<String> response;
try {
response = taskFeignClient.submitHpcJob(req);
response = taskFeignClient.adapterSubmitHpcJob(req);
return response;
} catch (Exception e) {
CoreLogger.error("SubmitHpcJob Exception:{}", e.getMessage());

4
common/src/main/java/com/sdm/common/feign/inter/pbs/ITaskFeignClient.java
View File

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping;
public interface ITaskFeignClient {
// "作业提交"
@PostMapping(value = "/pbs/submitHpcJob", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
SdmResponse<String> submitHpcJob( SubmitHpcTaskRemoteReq req);
@PostMapping(value = "/pbs/adapterSubmitHpcJob", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
SdmResponse<String> adapterSubmitHpcJob( SubmitHpcTaskRemoteReq req);
}