From 9783363dba44f8606e88d2f28349759e3914ea27 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 16 十月 2024 09:25:57 +0800 Subject: [PATCH] 1、版本部分整合 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 33 --------------------------------- 1 files changed, 0 insertions(+), 33 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 83e7104..a03fade 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 @@ -334,39 +334,6 @@ } /** - * 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘 - * - * @param current - * @return - */ - @Override - public List<List<Map<String, Object>>> selectTemperingTerritory(String current) { - //姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹� - List<Map<String, Object>> resultCutTerritory = optimizeHeatDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeHeatDetail.class) - .selectAll(OptimizeHeatDetail.class) - .selectAs(OptimizeProject::getLoadWidth, "olWidth") - .selectAs(OptimizeProject::getLoadLength, "olHeight") - .leftJoin(OptimizeHeatLayout.class, on -> on - .eq(OptimizeHeatLayout::getProjectNo, OptimizeHeatDetail::getProjectNo) - .eq(OptimizeHeatLayout::getLayoutId, OptimizeHeatDetail::getLayoutId)) - .leftJoin(OptimizeProject.class, on -> on - .eq(OptimizeProject::getProjectNo, OptimizeHeatLayout::getProjectNo)) - .eq(OptimizeHeatDetail::getProjectNo, current) - ); - - Map<String, List<Map<String, Object>>> groupBy = resultCutTerritory.stream().collect(Collectors.groupingBy(item -> item.get("layout_id").toString())); -// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList()); - List<List<Map<String, Object>>> result = new ArrayList<>(); - for (int i = 1; i <= groupBy.keySet().size(); i++) { - String key = i + ""; - if (key != null) { - result.add(groupBy.get(key)); - } - } - return result; - } - - /** * 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿 * * @param glassId -- Gitblit v1.8.0