修改:hpc任务工作目录,最顶层统一目录

This commit is contained in:
yangyang01000846
2026-01-15 20:18:09 +08:00
parent 2cffd8389b
commit 575d2ea186
2 changed files with 5 additions and 6 deletions

View File

@@ -26,7 +26,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.flowable.engine.delegate.DelegateExecution;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
@@ -53,10 +52,6 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
@Autowired
private MessageFeignClientImpl messageFeignClient;
@Value("${hpc.mockCommand:}")
private String mockCommand;
/*
* params:业务参数
* config框架属性

View File

@@ -114,6 +114,9 @@ public class PbsServiceDecorator implements IPbsServiceDecorator {
@Value("${hpc.fileToHpc.http.mergePath:}")
private String fileToHpcMergePath;
@Value("${hpc.workDirPrePath:spdm}")
private String workDirPrePath;
@Override
public SdmResponse<HpcResouceInfo> queryHpcResource() {
return pbsService.queryHpcResource();
@@ -173,7 +176,8 @@ public class PbsServiceDecorator implements IPbsServiceDecorator {
log.info("Hpc任务执行开始用户id:{}", userId);
// 拼接逻辑
String subDirPrefix = Objects.isNull(userId) ? "" : (String.valueOf(userId) + "\\");
String subDir = subDirPrefix + req.getJobName() + "\\" + System.currentTimeMillis();
// spdm 开头
String subDir = workDirPrePath+subDirPrefix + req.getJobName() + "\\" + System.currentTimeMillis();
log.info("Hpc任务执行开始结果输出目录:{}", subDir);
return subDir;
}