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

新增：后置正则过滤文件，不传就传递所有，传递就按照正则回传文件

Browse Source
This commit is contained in:
15195
2026-02-10 17:18:33 +08:00
parent e34482000a
commit 475ba30aff
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/com/sdm/common/utils/HpcCommandExcuteUtil.java
View File

@@ -180,7 +180,7 @@ public class HpcCommandExcuteUtil {
public SdmResponse<Boolean> callHpcUploadToTarget(String jobId, String workDir,String minioBucket, public SdmResponse<Boolean> callHpcUploadToTarget(String jobId, String workDir,String minioBucket,
String callBackMinioDir,String callBackNasDir, String callBackMinioDir,String callBackNasDir,
Long dirId,Long userId,Long tenantId) { Long dirId,Long userId,Long tenantId,String outputFormat) {
com.alibaba.fastjson2.JSONObject paramJson = new com.alibaba.fastjson2.JSONObject(); com.alibaba.fastjson2.JSONObject paramJson = new com.alibaba.fastjson2.JSONObject();
paramJson.put("jobId", jobId); paramJson.put("jobId", jobId);
paramJson.put("jobWorkDir", workDir); paramJson.put("jobWorkDir", workDir);
@@ -190,6 +190,7 @@ public class HpcCommandExcuteUtil {
paramJson.put("dirId", dirId); paramJson.put("dirId", dirId);
paramJson.put("userId", userId); paramJson.put("userId", userId);
paramJson.put("tenantId", tenantId); paramJson.put("tenantId", tenantId);
paramJson.put("outputFormat", outputFormat);
Boolean call = false; Boolean call = false;
String resultString = ""; String resultString = "";
try { try {

2
pbs/src/main/java/com/sdm/pbs/controller/TaskController.java
View File

@@ -248,7 +248,7 @@ public class TaskController {
return hpcInstructionService.callHpcUploadToTarget(paramMap.get("jobId").toString(), paramMap.get("jobWorkDir").toString(), return hpcInstructionService.callHpcUploadToTarget(paramMap.get("jobId").toString(), paramMap.get("jobWorkDir").toString(),
paramMap.get("minioBucket").toString(), paramMap.get("callBackMinioDir").toString() paramMap.get("minioBucket").toString(), paramMap.get("callBackMinioDir").toString()
,paramMap.get("callBackNasDir").toString(), Long.valueOf(paramMap.get("dirId").toString()), ,paramMap.get("callBackNasDir").toString(), Long.valueOf(paramMap.get("dirId").toString()),
Long.valueOf(paramMap.get("userId").toString()),Long.valueOf(paramMap.get("tenantId").toString())); Long.valueOf(paramMap.get("userId").toString()),Long.valueOf(paramMap.get("tenantId").toString()),paramMap.get("outputFormat").toString());
} }
} }

3
pbs/src/main/java/com/sdm/pbs/schedule/hpc/hander/FinishedStatusHandler.java
View File

@@ -95,9 +95,10 @@ public class FinishedStatusHandler implements JobStatusHandler {
String minioBucket = minioBucketPrefix + newDbJob.getTenantId(); String minioBucket = minioBucketPrefix + newDbJob.getTenantId();
Long userId=newDbJob.getCreatorId(); Long userId=newDbJob.getCreatorId();
Long tenantId = newDbJob.getTenantId(); Long tenantId = newDbJob.getTenantId();
String outputFormat = newDbJob.getOutputFormat();
// 通知工具回传文件 minio 或者 nas // 通知工具回传文件 minio 或者 nas
SdmResponse<Boolean> callResponse = hpcInstructionService.callHpcUploadToTarget(newDbJob.getJobId(), newDbJob.getStdoutHpcFilePath(),minioBucket, SdmResponse<Boolean> callResponse = hpcInstructionService.callHpcUploadToTarget(newDbJob.getJobId(), newDbJob.getStdoutHpcFilePath(),minioBucket,
newDbJob.getStdoutSpdmMinoFilePath(),newDbJob.getStdoutSpdmNasFilePath(),newDbJob.getDirId(),userId,tenantId); newDbJob.getStdoutSpdmMinoFilePath(),newDbJob.getStdoutSpdmNasFilePath(),newDbJob.getDirId(),userId,tenantId,outputFormat);
if (!callResponse.isSuccess()||!callResponse.getData()) { if (!callResponse.isSuccess()||!callResponse.getData()) {
CoreLogger.error("callHpcUploadToTarget failed,jobId:{},workDir:{}",newDbJob.getJobId(),newDbJob.getStdoutHpcFilePath()); CoreLogger.error("callHpcUploadToTarget failed,jobId:{},workDir:{}",newDbJob.getJobId(),newDbJob.getStdoutHpcFilePath());
return; return;

2
pbs/src/main/java/com/sdm/pbs/service/HpcInstructionService.java
View File

@@ -57,6 +57,6 @@ public interface HpcInstructionService {
// 通知hpc回传文件 // 通知hpc回传文件
SdmResponse<Boolean> callHpcUploadToTarget(String jobId,String workDir,String minioBucket, SdmResponse<Boolean> callHpcUploadToTarget(String jobId,String workDir,String minioBucket,
String callBackMinioDir,String callBackNasDir,Long dirId, String callBackMinioDir,String callBackNasDir,Long dirId,
Long userId,Long tenantId); Long userId,Long tenantId,String outputFormat);
} }

4
pbs/src/main/java/com/sdm/pbs/service/impl/HpcInstructionServiceImpl.java
View File

@@ -501,9 +501,9 @@ public class HpcInstructionServiceImpl implements HpcInstructionService {
@Override @Override
public SdmResponse<Boolean> callHpcUploadToTarget(String jobId,String workDir,String minioBucket, public SdmResponse<Boolean> callHpcUploadToTarget(String jobId,String workDir,String minioBucket,
String callBackMinioDir,String callBackNasDir,Long dirId, String callBackMinioDir,String callBackNasDir,Long dirId,
Long userId,Long tenantId) { Long userId,Long tenantId,String outputFormat) {
return hpcCommandExcuteUtil.callHpcUploadToTarget(jobId,workDir,minioBucket,callBackMinioDir, return hpcCommandExcuteUtil.callHpcUploadToTarget(jobId,workDir,minioBucket,callBackMinioDir,
callBackNasDir,dirId,userId,tenantId); callBackNasDir,dirId,userId,tenantId,outputFormat);
} }
/** /**