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

作业模式

Browse Source
This commit is contained in:
gulongcheng
2026-01-14 10:52:10 +08:00
parent 62d8a43535
commit 00a99a7222
2 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/sdm/common/feign/inter/project/ISimulationNodeFeignClient.java
View File

@@ -68,7 +68,7 @@ public interface ISimulationNodeFeignClient {
* @param req
* @return
*/
@PostMapping("/getRunListByNodeId")
@PostMapping("/node/getRunListByNodeId")
SdmResponse<List<String>> getRunListByNodeId(@RequestBody SpdmQueryRunListReq req);
/**
@@ -77,7 +77,7 @@ public interface ISimulationNodeFeignClient {
* @param req
* @return
*/
@PostMapping("/getRunListByRunIdList")
@PostMapping("/node/getRunListByRunIdList")
SdmResponse<List<SimulationRunResp>> getRunListByRunIdList(@RequestBody SpdmQueryRunInfoListReq req);
}

44
data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java
View File

@@ -39,6 +39,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -404,25 +405,36 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
log.error("作业模式下，未查询到对应的nodeUUids");
return SdmResponse.success();
}
String nodeType = nodeFileInfos.get(0).getRelatedResourceUuidOwnType();
// 基于 nodeUUids 获取 算列的run的uuids
SpdmQueryRunListReq spdmQueryRunListReq = new SpdmQueryRunListReq();
spdmQueryRunListReq.setNodeIdList(nodeUUids);
spdmQueryRunListReq.setNodeType(nodeType);
SdmResponse<List<String>> resp = simuluationNodeFeignClient.getRunListByNodeId(spdmQueryRunListReq);
if(!resp.isSuccess()){
log.info("作业模式下，未查询到对应算列的runUuids");
return SdmResponse.success();
}
List<String> runUuids = resp.getData();
if(CollectionUtils.isEmpty(runUuids)){
log.info("作业模式下，未查询到对应算列的runUuids");
return SdmResponse.success();
List<FileMetadataInfo> runFileInfos = new ArrayList<>();
if(NodeTypeEnum.TASK.getValue().equalsIgnoreCase(nodeType)){
runFileInfos = fileMetadataInfoService.lambdaQuery()
.eq(FileMetadataInfo::getRelatedResourceUuidOwnType, NodeTypeEnum.RUN.getValue())
.in(FileMetadataInfo::getParentId, fileIds).list();
}else if(NodeTypeEnum.RUN.getValue().equalsIgnoreCase(nodeType)){
runFileInfos = nodeFileInfos;
} else if (NodeTypeEnum.isNodeType(nodeType)) {
// 基于 nodeUUids 获取 算列的run的uuids
SpdmQueryRunListReq spdmQueryRunListReq = new SpdmQueryRunListReq();
spdmQueryRunListReq.setNodeIdList(nodeUUids);
spdmQueryRunListReq.setNodeType(nodeType);
SdmResponse<List<String>> resp = simuluationNodeFeignClient.getRunListByNodeId(spdmQueryRunListReq);
if (!resp.isSuccess()) {
log.info("作业模式下，未查询到对应算列的runUuids");
return SdmResponse.success();
}
List<String> runUuids = resp.getData();
if (CollectionUtils.isEmpty(runUuids)) {
log.info("作业模式下，未查询到对应算列的runUuids");
return SdmResponse.success();
}
// 根据runUuids获取文件信息
runFileInfos = fileMetadataInfoService.lambdaQuery().in(FileMetadataInfo::getRelatedResourceUuid, runUuids).list();
}
// 根据runUuids获取文件信息
List<FileMetadataInfo> runFileInfos = fileMetadataInfoService.lambdaQuery().in(FileMetadataInfo::getRelatedResourceUuid, runUuids).list();
if (CollectionUtils.isEmpty(runFileInfos)) {
log.info("作业模式下，未查询到对应的算列的文件信息");
@@ -548,7 +560,7 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
list.forEach(fileMetadataInfo -> {
Long creatorId = fileMetadataInfo.getCreatorId();
CIDUserResp cidUser = cidUserMap.get(creatorId);
String username = Objects.isNull(cidUser) ? "" : org.apache.commons.lang3.StringUtils.firstNonBlank(
String username = Objects.isNull(cidUser) ? "" : StringUtils.firstNonBlank(
cidUser.getNickname(),
cidUser.getUsername(),
cidUser.getRealName()