From 1a004b55cd6bb7be2d41e7cd39d374964920897f Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 22 Nov 2024 16:55:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E6=9E=97=E6=B0=8F=E5=B7=A5?= =?UTF-8?q?=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改回传时修改的状态不正确的问题 --- .../service/impl/FactoryNodePushServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/FactoryNodePushServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/FactoryNodePushServiceImpl.java index 0c9d78595..1eed9bfbb 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/FactoryNodePushServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/FactoryNodePushServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; @@ -234,10 +235,14 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl data.get(data.size() - 1)).collect(Collectors.toList()); - // 按 workedNodeCode 正序 - // updateList.sort(Comparator.comparingInt(PackageInfoEntity::getWorkedNodeCode)); + updateList = updateList.stream() + .collect(Collectors.groupingBy(PackageInfoEntity::getId)) + .values().stream() + .map(data -> data.stream() + .max(Comparator.comparing(PackageInfoEntity::getWorkedNodeCode)) + .orElse(null)) + .filter(Objects::nonNull) + .collect(Collectors.toList()); packageInfoService.updateBatchById(updateList); } }