feat(user): 批量获取用户昵称并优化相关服务调用

- 在 ISysUserService 中新增 selectNickNameMapByUserNames 方法
- 实现批量查询用户昵称的功能,提高查询效率
- 移除原有的单个用户查询方法 selectUserByUserName
- 优化 WmsCoilPendingActionServiceImpl 中的用户昵称设置逻辑
- 优化 WmsDeliveryPlanServiceImpl 中的用户昵称设置逻辑
- 优化 WmsMaterialCoilServiceImpl 中的用户昵称设置逻辑
- 删除重复的 getUserNickname 私有方法
- 在 WmsCoilPendingActionVo 中新增 operatorByName 字段
- 统一使用新的批量接口替代原有单条查询方式
- 添加必要的 import 和工具类引用
This commit is contained in:
2025-12-05 13:50:29 +08:00
parent bb7119c91d
commit 7f7c3d615d
6 changed files with 83 additions and 96 deletions

View File

@@ -5,6 +5,7 @@ import com.klp.common.core.domain.entity.SysUser;
import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.page.TableDataInfo;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 用户 业务层 * 用户 业务层
@@ -40,13 +41,8 @@ public interface ISysUserService {
*/ */
TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery); TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery);
/**
* 通过用户名查询用户
*
* @param userName 用户名
* @return 用户对象信息
*/
SysUser selectUserByUserName(String userName); SysUser selectUserByUserName(String userName);
Map<String, String> selectNickNameMapByUserNames(List<String> userNames);
/** /**
* 通过手机号查询用户 * 通过手机号查询用户

View File

@@ -36,6 +36,8 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap;
import java.util.stream.Collectors;
/** /**
* 用户 业务层处理 * 用户 业务层处理
@@ -140,6 +142,18 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
return baseMapper.selectUserByUserName(userName); return baseMapper.selectUserByUserName(userName);
} }
@Override
public Map<String, String> selectNickNameMapByUserNames(List<String> userNames) {
if (CollUtil.isEmpty(userNames)) {
return new HashMap<>();
}
List<SysUser> users = baseMapper.selectList(new LambdaQueryWrapper<SysUser>()
.select(SysUser::getUserName, SysUser::getNickName)
.in(SysUser::getUserName, userNames)
.eq(SysUser::getDelFlag, UserConstants.USER_NORMAL));
return users.stream().collect(Collectors.toMap(SysUser::getUserName, SysUser::getNickName, (a, b) -> a));
}
/** /**
* 通过手机号查询用户 * 通过手机号查询用户
* *

View File

@@ -160,5 +160,8 @@ public class WmsCoilPendingActionVo extends BaseEntity implements Serializable {
* 更新人昵称 * 更新人昵称
*/ */
private String updateByName; private String updateByName;
private String operatorByName;
} }

View File

@@ -19,9 +19,8 @@ import com.klp.domain.WmsCoilPendingAction;
import com.klp.mapper.WmsCoilPendingActionMapper; import com.klp.mapper.WmsCoilPendingActionMapper;
import com.klp.service.IWmsCoilPendingActionService; import com.klp.service.IWmsCoilPendingActionService;
import java.util.List; import java.util.*;
import java.util.Collection; import java.util.stream.Collectors;
import java.util.Date;
/** /**
* 钢卷待操作Service业务层处理 * 钢卷待操作Service业务层处理
@@ -52,14 +51,26 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
public TableDataInfo<WmsCoilPendingActionVo> queryPageList(WmsCoilPendingActionBo bo, PageQuery pageQuery) { public TableDataInfo<WmsCoilPendingActionVo> queryPageList(WmsCoilPendingActionBo bo, PageQuery pageQuery) {
QueryWrapper<WmsCoilPendingAction> lqw = buildQueryWrapperPlus(bo); QueryWrapper<WmsCoilPendingAction> lqw = buildQueryWrapperPlus(bo);
Page<WmsCoilPendingActionVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); Page<WmsCoilPendingActionVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
result.getRecords().forEach(item -> { List<WmsCoilPendingActionVo> records = result.getRecords();
if (item.getCreateBy() != null) { Set<String> userNames = records.stream()
item.setCreateByName(getUserNickname(item.getCreateBy())); .flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getOperatorName()))
} .filter(StringUtils::isNotBlank)
if (item.getUpdateBy() != null) { .collect(Collectors.toSet());
item.setUpdateByName(getUserNickname(item.getUpdateBy())); if (!userNames.isEmpty()) {
} Map<String, String> nickMap = userService.selectNickNameMapByUserNames(records.stream()
}); .flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getOperatorName()))
.filter(StringUtils::isNotBlank)
.distinct()
.collect(Collectors.toList()));
records.forEach(item -> {
if (StringUtils.isNotBlank(item.getCreateBy())) {
item.setCreateByName(nickMap.getOrDefault(item.getCreateBy(), item.getCreateBy()));
}
if (StringUtils.isNotBlank(item.getOperatorName())) {
item.setOperatorByName(nickMap.getOrDefault(item.getOperatorName(), item.getOperatorName()));
}
});
}
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
@@ -79,25 +90,6 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
return qw; return qw;
} }
/**
* 根据用户名获取用户昵称
* @param username 用户名
* @return 用户昵称
*/
private String getUserNickname(String username) {
try {
// 通过用户名查找用户
SysUser user = userService.selectUserByUserName(username);
if (user != null) {
return user.getNickName();
}
} catch (Exception e) {
// 出现异常时返回原用户名
return username;
}
// 找不到用户时返回原用户名
return username;
}
/** /**
* 查询钢卷待操作列表 * 查询钢卷待操作列表
*/ */

View File

@@ -8,20 +8,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils; import com.klp.common.utils.StringUtils;
import com.klp.domain.vo.WmsDeliveryPlanStatisticsVo; import com.klp.domain.vo.*;
import com.klp.domain.vo.WmsDeliveryReportByTypeVo;
import com.klp.domain.vo.WmsDeliveryReportResultVo;
import com.klp.domain.vo.WmsDeliveryReportSummaryVo;
import com.klp.system.service.ISysUserService; import com.klp.system.service.ISysUserService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.klp.domain.bo.WmsDeliveryPlanBo; import com.klp.domain.bo.WmsDeliveryPlanBo;
import com.klp.domain.vo.WmsDeliveryPlanVo;
import com.klp.domain.WmsDeliveryPlan; import com.klp.domain.WmsDeliveryPlan;
import com.klp.mapper.WmsDeliveryPlanMapper; import com.klp.mapper.WmsDeliveryPlanMapper;
import com.klp.service.IWmsDeliveryPlanService; import com.klp.service.IWmsDeliveryPlanService;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* 发货计划Service业务层处理 * 发货计划Service业务层处理
@@ -52,35 +49,27 @@ public class WmsDeliveryPlanServiceImpl implements IWmsDeliveryPlanService {
public TableDataInfo<WmsDeliveryPlanVo> queryPageList(WmsDeliveryPlanBo bo, PageQuery pageQuery) { public TableDataInfo<WmsDeliveryPlanVo> queryPageList(WmsDeliveryPlanBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsDeliveryPlan> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<WmsDeliveryPlan> lqw = buildQueryWrapper(bo);
Page<WmsDeliveryPlanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<WmsDeliveryPlanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
result.getRecords().forEach(item -> { List<WmsDeliveryPlanVo> records = result.getRecords();
if (item.getCreateBy() != null) { Set<String> userNames = records.stream()
item.setCreateByName(getUserNickname(item.getCreateBy())); .flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getUpdateBy()))
} .filter(StringUtils::isNotBlank)
if (item.getUpdateBy() != null) { .collect(Collectors.toSet());
item.setUpdateByName(getUserNickname(item.getUpdateBy())); if (!userNames.isEmpty()) {
} Map<String, String> nickMap = userService.selectNickNameMapByUserNames(records.stream()
}); .flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getUpdateBy()))
return TableDataInfo.build(result); .filter(StringUtils::isNotBlank)
} .distinct()
.collect(Collectors.toList()));
/** records.forEach(item -> {
* 根据用户名获取用户昵称 if (StringUtils.isNotBlank(item.getCreateBy())) {
* @param username 用户名 item.setCreateByName(nickMap.getOrDefault(item.getCreateBy(), item.getCreateBy()));
* @return 用户昵称 }
*/ if (StringUtils.isNotBlank(item.getUpdateBy())) {
private String getUserNickname(String username) { item.setUpdateByName(nickMap.getOrDefault(item.getUpdateBy(), item.getUpdateBy()));
try { }
// 通过用户名查找用户 });
SysUser user = userService.selectUserByUserName(username);
if (user != null) {
return user.getNickName();
}
} catch (Exception e) {
// 出现异常时返回原用户名
return username;
} }
// 找不到用户时返回原用户名 return TableDataInfo.build(result);
return username;
} }
/** /**

View File

@@ -286,14 +286,26 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
QueryWrapper<WmsMaterialCoil> qw = buildQueryWrapperPlus(bo); QueryWrapper<WmsMaterialCoil> qw = buildQueryWrapperPlus(bo);
Page<WmsMaterialCoilVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw); Page<WmsMaterialCoilVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
result.getRecords().forEach(item -> { List<WmsMaterialCoilVo> records = result.getRecords();
if (item.getCreateBy() != null) { Set<String> userNames = records.stream()
item.setCreateByName(getUserNickname(item.getCreateBy())); .flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getUpdateBy()))
} .filter(StringUtils::isNotBlank)
if (item.getUpdateBy() != null) { .collect(Collectors.toSet());
item.setUpdateByName(getUserNickname(item.getUpdateBy())); if (!userNames.isEmpty()) {
} Map<String, String> nickMap = userService.selectNickNameMapByUserNames(records.stream()
}); .flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getUpdateBy()))
.filter(StringUtils::isNotBlank)
.distinct()
.collect(Collectors.toList()));
records.forEach(item -> {
if (StringUtils.isNotBlank(item.getCreateBy())) {
item.setCreateByName(nickMap.getOrDefault(item.getCreateBy(), item.getCreateBy()));
}
if (StringUtils.isNotBlank(item.getUpdateBy())) {
item.setUpdateByName(nickMap.getOrDefault(item.getUpdateBy(), item.getUpdateBy()));
}
});
}
// 从联查结果中构建产品和原材料对象(避免单独查询) // 从联查结果中构建产品和原材料对象(避免单独查询)
for (WmsMaterialCoilVo vo : result.getRecords()) { for (WmsMaterialCoilVo vo : result.getRecords()) {
@@ -350,25 +362,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
qw.orderByDesc("mc.create_time"); qw.orderByDesc("mc.create_time");
return qw; return qw;
} }
/**
* 根据用户名获取用户昵称
* @param username 用户名
* @return 用户昵称
*/
private String getUserNickname(String username) {
try {
// 通过用户名查找用户
SysUser user = userService.selectUserByUserName(username);
if (user != null) {
return user.getNickName();
}
} catch (Exception e) {
// 出现异常时返回原用户名
return username;
}
// 找不到用户时返回原用户名
return username;
}
/** /**
* 查询钢卷物料表列表 * 查询钢卷物料表列表