refactor(wms): 优化钢卷告警数据查询逻辑解决循环依赖
- 将钢卷信息批量查询逻辑从服务层迁移到控制器层 - 在控制器中实现钢卷ID收集和批量查询功能 - 通过Map映射方式关联钢卷信息到告警数据 - 移除服务层中的WmsMaterialCoilService依赖注入 - 提高数据查询效率和代码结构清晰度
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user