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

1、任务树的工位根据工位号排序

Browse Source
This commit is contained in:
lidongyang
2026-03-05 14:28:45 +08:00
parent 95cc8e4503
commit e2fe3d6b3c
2 changed files with 89 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
View File

@@ -601,9 +601,54 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
for (ProjectNodePo projectNodePo : realTopProjectNodeList) {
summaryWorkspaceNode(projectNodePo,projectNodePo.getChildren());
}
// 对工位进行排序，-M工位顺序排第一个
for (ProjectNodePo projectNodePo : realTopProjectNodeList) {
sortWorkspaceNode(projectNodePo);
}
return SdmResponse.success(realTopProjectNodeList.stream().flatMap(item -> item.getChildren().stream().filter(Objects::nonNull)).toList());
}
private void sortWorkspaceNode(ProjectNodePo projectNodePo) {
List<NodeAllBase> children = projectNodePo.getChildren();
if (CollectionUtils.isEmpty(children)) {
return;
}
List<NodeAllBase> workspaceNodeList = children.stream().filter(node -> NodeTypeEnum.WORKSPACE.getValue().equals(node.getNodeType())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(workspaceNodeList)) {
return;
}
// 对工位进行排序，-M工位顺序排第一个
workspaceNodeList = workspaceNodeList.stream().sorted(Comparator.comparing(NodeAllBase::getNodeCode)).collect(Collectors.toList());
NodeAllBase specialWorkspaceNode = workspaceNodeList.stream().filter(workspaceNode -> workspaceNode.getNodeCode().contains("-M")).findFirst().orElse(null);
log.info("specialWorkspaceNode为：{}",specialWorkspaceNode);
if (specialWorkspaceNode != null) {
moveTargetToFirst(workspaceNodeList,specialWorkspaceNode.getUuid());
}
}
public static void moveTargetToFirst(List<NodeAllBase> nodeList, String targetId) {
// 空值判断
if (nodeList == null || nodeList.isEmpty() || targetId == null) {
return;
}
// 遍历找到目标对象
NodeAllBase targetNode = null;
for (NodeAllBase node : nodeList) {
if (targetId.equals(node.getUuid())) {
targetNode = node;
break;
}
}
// 如果找到目标对象，先移除再添加到首位
if (targetNode != null) {
nodeList.remove(targetNode);
nodeList.add(0, targetNode);
}
}
private void summaryWorkspaceNode(ProjectNodePo projectNodePo,List<NodeAllBase> children) {
if (!NodeTypeEnum.WORKSPACE.getValue().equals(projectNodePo.getNodeType())) {
List<NodeAllBase> fChildren = projectNodePo.getChildren();

44
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -601,9 +601,53 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
for (ProjectNodePo projectNodePo : realTopProjectNodeList) {
generateTaskTree(projectNodePo, taskTreeNodeList, taskTreeTaskList, taskTreeTagMap, firstNodeTag, lastNodeTag, taskTreeNodeTypeTagMap, taskTreeRunList);
}
// 对工位进行排序，-M工位顺序排第一个
for (ProjectNodePo projectNodePo : realTopProjectNodeList) {
sortWorkspaceNode(projectNodePo);
}
return SdmResponse.success(realTopProjectNodeList.stream().flatMap(item -> item.getChildren().stream().filter(Objects::nonNull)).toList());
}
private void sortWorkspaceNode(ProjectNodePo projectNodePo) {
List<NodeAllBase> children = projectNodePo.getChildren();
if (CollectionUtils.isEmpty(children)) {
return;
}
List<NodeAllBase> workspaceNodeList = children.stream().filter(node -> NodeTypeEnum.WORKSPACE.getValue().equals(node.getNodeType())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(workspaceNodeList)) {
return;
}
// 对工位进行排序，-M工位顺序排第一个
workspaceNodeList = workspaceNodeList.stream().sorted(Comparator.comparing(NodeAllBase::getNodeCode)).collect(Collectors.toList());
NodeAllBase specialWorkspaceNode = workspaceNodeList.stream().filter(workspaceNode -> workspaceNode.getNodeCode().contains("-M")).findFirst().orElse(null);
log.info("specialWorkspaceNode为：{}",specialWorkspaceNode);
if (specialWorkspaceNode != null) {
moveTargetToFirst(workspaceNodeList,specialWorkspaceNode.getUuid());
}
}
public static void moveTargetToFirst(List<NodeAllBase> nodeList, String targetId) {
// 空值判断
if (nodeList == null || nodeList.isEmpty() || targetId == null) {
return;
}
// 遍历找到目标对象
NodeAllBase targetNode = null;
for (NodeAllBase node : nodeList) {
if (targetId.equals(node.getUuid())) {
targetNode = node;
break;
}
}
// 如果找到目标对象，先移除再添加到首位
if (targetNode != null) {
nodeList.remove(targetNode);
nodeList.add(0, targetNode);
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public SdmResponse addTaskRun(SpdmAddTaskRunReq req) {