From e00d1357b00248d94a01b9ea82c5957effd97d26 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 9 Jun 2026 17:08:01 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E4=BC=98=E5=8C=96=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E5=91=8A=E8=AD=A6=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=A7=A3=E5=86=B3=E5=BE=AA=E7=8E=AF=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将钢卷信息批量查询逻辑从服务层迁移到控制器层
- 在控制器中实现钢卷ID收集和批量查询功能
- 通过Map映射方式关联钢卷信息到告警数据
- 移除服务层中的WmsMaterialCoilService依赖注入
- 提高数据查询效率和代码结构清晰度
---
 .../WmsMaterialWarningController.java         | 35 ++++++++++++++++++-
 .../impl/WmsMaterialWarningServiceImpl.java   | 29 +--------------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java
index ea8721d8..f52f8ffc 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java
@@ -2,7 +2,11 @@ package com.klp.controller;
 
 import java.util.List;
 import java.util.Arrays;
+import java.util.stream.Collectors;
 
+import com.klp.domain.bo.WmsMaterialCoilBo;
+import com.klp.domain.vo.WmsMaterialCoilVo;
+import com.klp.service.IWmsMaterialCoilService;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -35,13 +39,42 @@ import com.klp.common.core.page.TableDataInfo;
 public class WmsMaterialWarningController extends BaseController {
 
     private final IWmsMaterialWarningService iWmsMaterialWarningService;
+    private final IWmsMaterialCoilService wmsMaterialCoilService;
 
     /**
      * 查询钢卷通用维度告警（长度/厚度/宽度）列表
      */
     @GetMapping("/list")
     public TableDataInfo<WmsMaterialWarningVo> list(WmsMaterialWarningBo bo, PageQuery pageQuery) {
-        return iWmsMaterialWarningService.queryPageList(bo, pageQuery);
+        TableDataInfo<WmsMaterialWarningVo> result = iWmsMaterialWarningService.queryPageList(bo, pageQuery);
+        // 收集所有钢卷ID，批量查询钢卷信息并填充
+        List<WmsMaterialWarningVo> list = result.getRows();
+        if (list != null && !list.isEmpty()) {
+            String coilIds = list.stream()
+                .map(WmsMaterialWarningVo::getCoilId)
+                .filter(java.util.Objects::nonNull)
+                .distinct()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+            if (!coilIds.isEmpty()) {
+                WmsMaterialCoilBo wmsMaterialCoilBo = new WmsMaterialCoilBo();
+                wmsMaterialCoilBo.setCoilIds(coilIds);
+                List<WmsMaterialCoilVo> coilVos = wmsMaterialCoilService.queryList(wmsMaterialCoilBo);
+                java.util.Map<Long, WmsMaterialCoilVo> coilMap = coilVos.stream()
+                    .filter(v -> v.getCoilId() != null)
+                    .collect(java.util.stream.Collectors.toMap(
+                        WmsMaterialCoilVo::getCoilId,
+                        v -> v,
+                        (a, b) -> a));
+                for (WmsMaterialWarningVo warning : list) {
+                    WmsMaterialCoilVo coilVo = coilMap.get(warning.getCoilId());
+                    if (coilVo != null) {
+                        warning.setCoilVo(coilVo);
+                    }
+                }
+            }
+        }
+        return result;
     }
 
     /**
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java
index 87836f54..f9fbee7e 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java
@@ -43,7 +43,7 @@ public class WmsMaterialWarningServiceImpl implements IWmsMaterialWarningService
 
     private final WmsMaterialWarningMapper baseMapper;
     private final ConfigService configService;
-    private final IWmsMaterialCoilService wmsMaterialCoilService;
+
 
     /**
      * 查询钢卷通用维度告警（长度/厚度/宽度）
@@ -60,33 +60,6 @@ public class WmsMaterialWarningServiceImpl implements IWmsMaterialWarningService
     public TableDataInfo<WmsMaterialWarningVo> queryPageList(WmsMaterialWarningBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<WmsMaterialWarning> lqw = buildQueryWrapper(bo);
         Page<WmsMaterialWarningVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        // 收集所有钢卷ID，批量查询钢卷信息并填充
-        List<WmsMaterialWarningVo> list = result.getRecords();
-        if (list != null && !list.isEmpty()) {
-            String coilIds = list.stream()
-                .map(WmsMaterialWarningVo::getCoilId)
-                .filter(java.util.Objects::nonNull)
-                .distinct()
-                .map(String::valueOf)
-                .collect(Collectors.joining(","));
-            if (!coilIds.isEmpty()) {
-                WmsMaterialCoilBo wmsMaterialCoilBo = new WmsMaterialCoilBo();
-                wmsMaterialCoilBo.setCoilIds(coilIds);
-                List<WmsMaterialCoilVo> coilVos = wmsMaterialCoilService.queryList(wmsMaterialCoilBo);
-                java.util.Map<Long, WmsMaterialCoilVo> coilMap = coilVos.stream()
-                    .filter(v -> v.getCoilId() != null)
-                    .collect(java.util.stream.Collectors.toMap(
-                        WmsMaterialCoilVo::getCoilId,
-                        v -> v,
-                        (a, b) -> a));
-                for (WmsMaterialWarningVo warning : list) {
-                    WmsMaterialCoilVo coilVo = coilMap.get(warning.getCoilId());
-                    if (coilVo != null) {
-                        warning.setCoilVo(coilVo);
-                    }
-                }
-            }
-        }
         return TableDataInfo.build(result);
     }