From 9212801fbac08dd12b8205c217bdeb925529ab7c Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期四, 27 二月 2025 09:55:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java index 926e547..a11dd98 100644 --- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java +++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java @@ -24,6 +24,8 @@ import javax.annotation.Resource; import java.util.Arrays; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * (HollowBigStorageCageDetails)琛ㄦ湇鍔″疄鐜扮被 @@ -71,8 +73,9 @@ } @Override - public List<BigStorageVO> queryHollowbigStorageCageDetail() { - return baseMapper.queryHollowbigStorageCageDetail(); + public Map<Integer, List<BigStorageVO>> queryHollowbigStorageCageDetail() { + List<BigStorageVO> bigStorageCages = baseMapper.queryHollowbigStorageCageDetail(); + return bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId())); } @Override -- Gitblit v1.8.0