diff --git a/common/src/main/java/com/sdm/common/utils/HpcCommandExcuteUtil.java b/common/src/main/java/com/sdm/common/utils/HpcCommandExcuteUtil.java index b958d6cc..9006d472 100644 --- a/common/src/main/java/com/sdm/common/utils/HpcCommandExcuteUtil.java +++ b/common/src/main/java/com/sdm/common/utils/HpcCommandExcuteUtil.java @@ -180,7 +180,7 @@ public class HpcCommandExcuteUtil { public SdmResponse callHpcUploadToTarget(String jobId, String workDir,String minioBucket, 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(); paramJson.put("jobId", jobId); paramJson.put("jobWorkDir", workDir); @@ -190,6 +190,7 @@ public class HpcCommandExcuteUtil { paramJson.put("dirId", dirId); paramJson.put("userId", userId); paramJson.put("tenantId", tenantId); + paramJson.put("outputFormat", outputFormat); Boolean call = false; String resultString = ""; try { diff --git a/pbs/src/main/java/com/sdm/pbs/controller/TaskController.java b/pbs/src/main/java/com/sdm/pbs/controller/TaskController.java index 49e70905..85725453 100644 --- a/pbs/src/main/java/com/sdm/pbs/controller/TaskController.java +++ b/pbs/src/main/java/com/sdm/pbs/controller/TaskController.java @@ -248,7 +248,7 @@ public class TaskController { return hpcInstructionService.callHpcUploadToTarget(paramMap.get("jobId").toString(), paramMap.get("jobWorkDir").toString(), paramMap.get("minioBucket").toString(), paramMap.get("callBackMinioDir").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()); } } diff --git a/pbs/src/main/java/com/sdm/pbs/schedule/hpc/hander/FinishedStatusHandler.java b/pbs/src/main/java/com/sdm/pbs/schedule/hpc/hander/FinishedStatusHandler.java index cf9cf41e..4aa7088a 100644 --- a/pbs/src/main/java/com/sdm/pbs/schedule/hpc/hander/FinishedStatusHandler.java +++ b/pbs/src/main/java/com/sdm/pbs/schedule/hpc/hander/FinishedStatusHandler.java @@ -95,9 +95,10 @@ public class FinishedStatusHandler implements JobStatusHandler { String minioBucket = minioBucketPrefix + newDbJob.getTenantId(); Long userId=newDbJob.getCreatorId(); Long tenantId = newDbJob.getTenantId(); + String outputFormat = newDbJob.getOutputFormat(); // 通知工具回传文件 minio 或者 nas SdmResponse 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()) { CoreLogger.error("callHpcUploadToTarget failed,jobId:{},workDir:{}",newDbJob.getJobId(),newDbJob.getStdoutHpcFilePath()); return; diff --git a/pbs/src/main/java/com/sdm/pbs/service/HpcInstructionService.java b/pbs/src/main/java/com/sdm/pbs/service/HpcInstructionService.java index 1164d605..20e60877 100644 --- a/pbs/src/main/java/com/sdm/pbs/service/HpcInstructionService.java +++ b/pbs/src/main/java/com/sdm/pbs/service/HpcInstructionService.java @@ -57,6 +57,6 @@ public interface HpcInstructionService { // 通知hpc回传文件 SdmResponse callHpcUploadToTarget(String jobId,String workDir,String minioBucket, String callBackMinioDir,String callBackNasDir,Long dirId, - Long userId,Long tenantId); + Long userId,Long tenantId,String outputFormat); } diff --git a/pbs/src/main/java/com/sdm/pbs/service/impl/HpcInstructionServiceImpl.java b/pbs/src/main/java/com/sdm/pbs/service/impl/HpcInstructionServiceImpl.java index 2037ca41..7aeaaa4c 100644 --- a/pbs/src/main/java/com/sdm/pbs/service/impl/HpcInstructionServiceImpl.java +++ b/pbs/src/main/java/com/sdm/pbs/service/impl/HpcInstructionServiceImpl.java @@ -501,9 +501,9 @@ public class HpcInstructionServiceImpl implements HpcInstructionService { @Override public SdmResponse callHpcUploadToTarget(String jobId,String workDir,String minioBucket, String callBackMinioDir,String callBackNasDir,Long dirId, - Long userId,Long tenantId) { + Long userId,Long tenantId,String outputFormat) { return hpcCommandExcuteUtil.callHpcUploadToTarget(jobId,workDir,minioBucket,callBackMinioDir, - callBackNasDir,dirId,userId,tenantId); + callBackNasDir,dirId,userId,tenantId,outputFormat); } /**