Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java

@@ -45,6 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -151,7 +152,12 @@ public class NodeDataPushListener {
 				for (Map.Entry<String, List<MtPushDataDTO>> stringListEntry : collect.entrySet()) {
 					String senderCode = stringListEntry.getKey();
 					List<MtPushDataDTO> mtPushDataDTOS1 = stringListEntry.getValue();
-					Map<String, MtPushDataDTO> mtPushDataDTOMap = mtPushDataDTOS1.stream().collect(Collectors.toMap(MtPushDataDTO::getOrderCode, mtPushDataDTO -> mtPushDataDTO));
+					Map<String, MtPushDataDTO> mtPushDataDTOMap = mtPushDataDTOS1.stream()
+						.collect(Collectors.toMap(
+							MtPushDataDTO::getOrderCode,
+							Function.identity(),
+							(existing, replacement) -> existing
+						));
 					CentralStkInConfirmVO confirmVO = CentralStkInConfirmVO.builder()
 						.senderCode(senderCode)
 						.operatingTime(operatorTime)