DeXun/klp-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(wms): 优化钢卷告警数据查询逻辑解决循环依赖

Browse Source 
- 将钢卷信息批量查询逻辑从服务层迁移到控制器层
- 在控制器中实现钢卷ID收集和批量查询功能
- 通过Map映射方式关联钢卷信息到告警数据
- 移除服务层中的WmsMaterialCoilService依赖注入
- 提高数据查询效率和代码结构清晰度
This commit is contained in:
Joshi
2026-06-09 17:08:01 +08:00
parent b9f87c6cc4
commit e00d1357b0
2 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java
View File

@@ -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;
}
/**

29
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java
View File

@@ -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);
}