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

fix[project]: 根据todoId去重，保留首次出现的待办

Browse Source
This commit is contained in:
lidongyang
2026-03-19 09:25:47 +08:00
parent 9bd917fca5
commit f4aff5752e
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2392,7 +2392,6 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
*/
private List<LyricVTodoEmulationInfoDM> queryTodoListWithFixedTime(String startTime, String endTime) {
// 查询原始待办数据
// TODO 这里要确认是不是只拉取有限元仿真
List<LyricVTodoEmulationInfoDM> todoInfoList = lyricVTodoInfoService.lambdaQuery()
.eq(LyricVTodoEmulationInfoDM::getRelevanceTask, DemandTypeEnum.FINITE_ELEMENT_SIMULATION.getName())
.ge(LyricVTodoEmulationInfoDM::getCreateTime, startTime)
@@ -2403,13 +2402,14 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
return Collections.emptyList();
}
// 过滤3D负责人为空的待办数据
todoInfoList = todoInfoList.stream().filter(todo -> StringUtils.isNotBlank(todo.getThreeDimensionalPerformer()))
.collect(Collectors.toList());
if (CollectionUtils.isEmpty(todoInfoList)) {
log.info("未查询到{}到{}的待同步的有效待办数据", startTime, endTime);
return Collections.emptyList();
}
// 根据todoId去重，保留首次出现的待办
todoInfoList = todoInfoList.stream()
// 过滤掉todoId为null的数据
.filter(dm -> dm.getTodoId() != null)
.collect(Collectors.collectingAndThen(
Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(LyricVTodoEmulationInfoDM::getTodoId))),
ArrayList::new
));
List<LyricVTodoEmulationInfoDM> expTodoInfoList = todoInfoList.stream().filter(todoInfo -> DemandTypeEnum.FINITE_ELEMENT_SIMULATION.getName().equals(todoInfo.getRelevanceTask()))
.toList();

9
project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
View File

@@ -3536,6 +3536,15 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
log.info("项目{}未查询到待办事项，无需同步", projectNum);
return SdmResponse.success();
}
// 根据todoId去重，保留首次出现的待办
todoInfoList = todoInfoList.stream()
// 过滤掉todoId为null的数据
.filter(dm -> dm.getTodoId() != null)
.collect(Collectors.collectingAndThen(
Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(LyricVTodoEmulationInfoDM::getTodoId))),
ArrayList::new
));
log.info("项目{}查询到{}条待办事项", projectNum, todoInfoList.size());
// 3. 过滤已同步的待办