From c1cd0a4ef780916be0a5af471aa9fd456a5e2e74 Mon Sep 17 00:00:00 2001 From: yangyang01000846 <15195822163@163.com> Date: Wed, 14 Jan 2026 09:15:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Ahpc=E5=9B=9E?= =?UTF-8?q?=E4=BC=A0=E8=B5=B0data=E6=9C=8D=E5=8A=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sdm/common/utils/HpcCommandExcuteUtil.java | 7 ++++++- .../main/java/com/sdm/pbs/controller/TaskController.java | 4 +++- .../sdm/pbs/schedule/hpc/hander/FinishedStatusHandler.java | 4 +++- .../java/com/sdm/pbs/service/HpcInstructionService.java | 4 +++- .../sdm/pbs/service/impl/HpcInstructionServiceImpl.java | 7 +++++-- 5 files changed, 20 insertions(+), 6 deletions(-) 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 9f2bb1cc..128e403b 100644 --- a/common/src/main/java/com/sdm/common/utils/HpcCommandExcuteUtil.java +++ b/common/src/main/java/com/sdm/common/utils/HpcCommandExcuteUtil.java @@ -172,13 +172,18 @@ public class HpcCommandExcuteUtil { return builder.body(body); } - public SdmResponse callHpcUploadToTarget(String jobId, String workDir,String minioBucket,String callBackMinioDir,String callBackNasDir) { + public SdmResponse callHpcUploadToTarget(String jobId, String workDir,String minioBucket, + String callBackMinioDir,String callBackNasDir, + Long dirId,Long userId,Long tenantId) { com.alibaba.fastjson2.JSONObject paramJson = new com.alibaba.fastjson2.JSONObject(); paramJson.put("jobId", jobId); paramJson.put("jobWorkDir", workDir); paramJson.put("minioBucket", minioBucket); paramJson.put("callBackMinioDir", callBackMinioDir); paramJson.put("callBackNasDir", callBackNasDir); + paramJson.put("dirId", dirId); + paramJson.put("userId", userId); + paramJson.put("tenantId", tenantId); 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 9ea944e9..dee34c2c 100644 --- a/pbs/src/main/java/com/sdm/pbs/controller/TaskController.java +++ b/pbs/src/main/java/com/sdm/pbs/controller/TaskController.java @@ -239,7 +239,9 @@ public class TaskController { @PostMapping("/callHpcUploadToTarget") public SdmResponse hpcDownloadFiles(@RequestBody Map paramMap) { return hpcInstructionService.callHpcUploadToTarget(paramMap.get("jobId").toString(), paramMap.get("jobWorkDir").toString(), - paramMap.get("minioBucket").toString(), paramMap.get("callBackMinioDir").toString(),paramMap.get("callBackNasDir").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())); } } 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 67a4dbdd..71b45c6a 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 @@ -44,9 +44,11 @@ public class FinishedStatusHandler implements JobStatusHandler { statusInfo.getStartTime(), statusInfo.getEndTime(), TimeUnit.SECONDS)); newDbJob.setUpdateTime(LocalDateTime.now()); String minioBucket = minioBucketPrefix + newDbJob.getTenantId(); + Long userId=newDbJob.getCreatorId(); + Long tenantId = newDbJob.getTenantId(); // 通知工具回传文件 minio 或者 nas SdmResponse callResponse = hpcInstructionService.callHpcUploadToTarget(newDbJob.getJobId(), newDbJob.getStdoutHpcFilePath(),minioBucket, - newDbJob.getStdoutSpdmMinoFilePath(),newDbJob.getStdoutSpdmNasFilePath()); + newDbJob.getStdoutSpdmMinoFilePath(),newDbJob.getStdoutSpdmNasFilePath(),newDbJob.getDirId(),userId,tenantId); 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 0f059db8..1164d605 100644 --- a/pbs/src/main/java/com/sdm/pbs/service/HpcInstructionService.java +++ b/pbs/src/main/java/com/sdm/pbs/service/HpcInstructionService.java @@ -55,6 +55,8 @@ public interface HpcInstructionService { ResponseEntity hpcDownloadFile(String fileName,Long fileSize); // 通知hpc回传文件 - SdmResponse callHpcUploadToTarget(String jobId,String workDir,String minioBucket,String callBackMinioDir,String callBackNasDir); + SdmResponse callHpcUploadToTarget(String jobId,String workDir,String minioBucket, + String callBackMinioDir,String callBackNasDir,Long dirId, + Long userId,Long tenantId); } 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 6b2f8fe4..1690c354 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 @@ -489,8 +489,11 @@ public class HpcInstructionServiceImpl implements HpcInstructionService { } @Override - public SdmResponse callHpcUploadToTarget(String jobId,String workDir,String minioBucket,String callBackMinioDir,String callBackNasDir) { - return hpcCommandExcuteUtil.callHpcUploadToTarget(jobId,workDir,minioBucket,callBackMinioDir,callBackNasDir); + public SdmResponse callHpcUploadToTarget(String jobId,String workDir,String minioBucket, + String callBackMinioDir,String callBackNasDir,Long dirId, + Long userId,Long tenantId) { + return hpcCommandExcuteUtil.callHpcUploadToTarget(jobId,workDir,minioBucket,callBackMinioDir, + callBackNasDir,dirId,userId,tenantId); } /**