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

1、仿真执行中，只显示有任务的工位 bug fix

Browse Source
This commit is contained in:
lidongyang
2026-03-05 18:10:48 +08:00
parent d494c37750
commit da6cfd539f
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -621,16 +621,26 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
return;
}
// 只显示有任务的工位
Iterator<NodeAllBase> childrenNodeListIterator = children.iterator();
Iterator<NodeAllBase> workspaceNodeListIterator = workspaceNodeList.iterator();
while (workspaceNodeListIterator.hasNext()) {
List<NodeAllBase> childrenNodeList = workspaceNodeListIterator.next().getChildren();
NodeAllBase workspaceNode = workspaceNodeListIterator.next();
List<NodeAllBase> childrenNodeList = workspaceNode.getChildren();
if (CollectionUtils.isEmpty(childrenNodeList)) {
workspaceNodeListIterator.remove();
while (childrenNodeListIterator.hasNext()) {
if (childrenNodeListIterator.next().getUuid().equals(workspaceNode.getUuid())) {
childrenNodeListIterator.remove();
}
}
continue;
}
List<NodeAllBase> taskNodeList = childrenNodeList.stream().filter(node -> NodeTypeEnum.TASK.getValue().equals(node.getNodeType())).toList();
if (CollectionUtils.isEmpty(taskNodeList)) {
workspaceNodeListIterator.remove();
while (childrenNodeListIterator.hasNext()) {
if (childrenNodeListIterator.next().getUuid().equals(workspaceNode.getUuid())) {
childrenNodeListIterator.remove();
}
}
}
}
// 对工位进行排序，-M工位顺序排第一个