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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gulongcheng
2025-12-08 10:45:01 +08:00
parent 7552dcb652 f5b408a6f7
commit b78c9c286a
18 changed files with 508 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,13 @@
package com.sdm.common.entity.req.pbs;
import com.alibaba.fastjson2.annotation.JSONField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.List;
import java.io.Serializable;
@Data
public class SubmitHpcTaskRemoteReq {
@Schema(description = "配置时的mm时间戳")
public String timesmap;
public class SubmitHpcTaskRemoteReq implements Serializable {
private static final long serialVersionUID = 10086L;
@Schema(description = "计算任务名称")
public String jobName;
@@ -29,14 +24,6 @@ public class SubmitHpcTaskRemoteReq {
@Schema(description = "计算任务是否独立存在 0：非独立任务 1：独立任务")
public int independence;
@Schema(description = "求解文件")
@JSONField(serialize = false)
public List<MultipartFile> inputFiles = new ArrayList<>();
@Schema(description = "计算主文件")
@JSONField(serialize = false)
public MultipartFile masterFile;
@Schema(description = "计算任务所属任务ID")
public String taskId;

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

@@ -4,7 +4,6 @@ import com.sdm.common.common.SdmResponse;
import com.sdm.common.config.LongTimeRespFeignConfig;
import com.sdm.common.entity.req.pbs.SubmitHpcTaskRemoteReq;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
@@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping;
public interface ITaskFeignClient {
// "作业提交"
@PostMapping(value = "/pbs/adapterSubmitHpcJob", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@PostMapping("/pbs/adapterSubmitHpcJob")
SdmResponse<String> adapterSubmitHpcJob( SubmitHpcTaskRemoteReq req);
}

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

@@ -329,7 +329,8 @@ public class FilesUtil {
String inputFilesRegularStr,
AtomicReference<String> masterFilePath,
List<String> inputFilePaths) {
Objects.requireNonNull(jobWorkDir, "jobWorkDir 不能为空");
log.info("求解文件目录={}", jobWorkDir);
Objects.requireNonNull(jobWorkDir, "本地求解文件夹不能为空");
boolean hasMasterRule =
masterFileRegularStr != null && !masterFileRegularStr.isBlank();
boolean hasInputRule =

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

@@ -172,10 +172,12 @@ public class HpcCommandExcuteUtil {
return builder.body(body);
}
public SdmResponse<Boolean> callHpcUploadToTarget(String jobId, String workDir) {
public SdmResponse<Boolean> callHpcUploadToTarget(String jobId, String workDir,String callBackMinioDir,String callBackNasDir) {
com.alibaba.fastjson2.JSONObject paramJson = new com.alibaba.fastjson2.JSONObject();
paramJson.put("jobId", jobId);
paramJson.put("jobWorkDir", workDir);
paramJson.put("callBackMinioDir", callBackMinioDir);
paramJson.put("callBackNasDir", callBackNasDir);
Boolean call = false;
String resultString = "";
try {