From 40c7ae42f96c9826d3436fa3bb1ea007ec698544 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 21 二月 2025 15:10:32 +0800
Subject: [PATCH] 添加大屏后端数据

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index 6b35e83..d710cbb 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -450,8 +450,9 @@
     }
 
     @Override
-    public List<BigStorageVO> querybigStorageCageDetail() {
-        return baseMapper.querybigStorageCageDetail();
+    public Map<Integer, List<BigStorageVO>> querybigStorageCageDetail() {
+        List<BigStorageVO> bigStorageCages= baseMapper.querybigStorageCageDetail();
+        return bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
     }
 
     @Override
@@ -476,8 +477,8 @@
                     .eq(GlassInfo::getEngineerId, engineerId)
                     .ne(GlassInfo::getTemperingLayoutId, 0)
                     .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
-                    .orderByAsc(GlassInfo::getTemperingLayoutId)
-                    .orderByAsc(GlassInfo::getTemperingFeedSequence)
+                    .orderByAsc(BigStorageCageDetails::getTemperingLayoutId)
+                    .orderByAsc(BigStorageCageDetails::getTemperingFeedSequence)
             );
             if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
                 temperingGlassInfoService.saveBatch(temperingGlassInfos);

--
Gitblit v1.8.0