From 47c33b4f988e65d1463d243e30422faacfbab99b Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 23 八月 2024 16:15:21 +0800
Subject: [PATCH] 防止破损表里有重复数据导致识别版图无法显示,当出现重复ID时,以最后一条的状态为准

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index d0f8f5c..eef3b5d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -152,7 +152,7 @@
             Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
                     .selectAll(Damage.class)
                     .eq(Damage::getEngineerId,upPattenUsage1.getEngineeringId())
-            ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage));
+            ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));
 
             List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
             for (Map<String, Object> cutTerritory : cutTerritorys) {
@@ -200,7 +200,7 @@
                 .selectAll(EdgStorageCageDetails.class)
                 .eq(EdgStorageCageDetails::getEngineerId,current)
                 .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
-        ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails));
+        ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails,(V1,V2)->V2));
 
         Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
                 .selectAll(Damage.class)

--
Gitblit v1.8.0