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

- 在 ISysUserService 中新增 selectNickNameMapByUserNames 方法 - 实现批量查询用户昵称的功能，提高查询效率 - 移除原有的单个用户查询方法 selectUserByUserName - 优化 WmsCoilPendingActionServiceImpl 中的用户昵称设置逻辑 - 优化 WmsDeliveryPlanServiceImpl 中的用户昵称设置逻辑 - 优化 WmsMaterialCoilServiceImpl 中的用户昵称设置逻辑 - 删除重复的 getUserNickname 私有方法 - 在 WmsCoilPendingActionVo 中新增 operatorByName 字段 - 统一使用新的批量接口替代原有单条查询方式 - 添加必要的 import 和工具类引用
2025-12-05 13:50:29 +08:00
parent bb7119c91d
commit 7f7c3d615d
6 changed files with 83 additions and 96 deletions
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
@@ -19,9 +19,8 @@ import com.klp.domain.WmsCoilPendingAction;
 import com.klp.mapper.WmsCoilPendingActionMapper;
 import com.klp.service.IWmsCoilPendingActionService;

-import java.util.List;
-import java.util.Collection;
-import java.util.Date;
+import java.util.*;
+import java.util.stream.Collectors;

 /**
 * 钢卷待操作Service业务层处理
@@ -52,14 +51,26 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
    public TableDataInfo<WmsCoilPendingActionVo> queryPageList(WmsCoilPendingActionBo bo, PageQuery pageQuery) {
        QueryWrapper<WmsCoilPendingAction> lqw = buildQueryWrapperPlus(bo);
        Page<WmsCoilPendingActionVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
-        result.getRecords().forEach(item -> {
-            if (item.getCreateBy() != null) {
-                item.setCreateByName(getUserNickname(item.getCreateBy()));
-            }
-            if (item.getUpdateBy() != null) {
-                item.setUpdateByName(getUserNickname(item.getUpdateBy()));
-            }
-        });
+        List<WmsCoilPendingActionVo> records = result.getRecords();
+        Set<String> userNames = records.stream()
+            .flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getOperatorName()))
+            .filter(StringUtils::isNotBlank)
+            .collect(Collectors.toSet());
+        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);
    }

@@ -79,25 +90,6 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
        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;
-    }
    /**
     * 查询钢卷待操作列表
     */
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java
@@ -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.toolkit.Wrappers;
 import com.klp.common.utils.StringUtils;
-import com.klp.domain.vo.WmsDeliveryPlanStatisticsVo;
-import com.klp.domain.vo.WmsDeliveryReportByTypeVo;
-import com.klp.domain.vo.WmsDeliveryReportResultVo;
-import com.klp.domain.vo.WmsDeliveryReportSummaryVo;
+import com.klp.domain.vo.*;
 import com.klp.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.klp.domain.bo.WmsDeliveryPlanBo;
-import com.klp.domain.vo.WmsDeliveryPlanVo;
 import com.klp.domain.WmsDeliveryPlan;
 import com.klp.mapper.WmsDeliveryPlanMapper;
 import com.klp.service.IWmsDeliveryPlanService;

 import java.util.*;
+import java.util.stream.Collectors;

 /**
 * 发货计划Service业务层处理
@@ -52,35 +49,27 @@ public class WmsDeliveryPlanServiceImpl implements IWmsDeliveryPlanService {
    public TableDataInfo<WmsDeliveryPlanVo> queryPageList(WmsDeliveryPlanBo bo, PageQuery pageQuery) {
        LambdaQueryWrapper<WmsDeliveryPlan> lqw = buildQueryWrapper(bo);
        Page<WmsDeliveryPlanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        result.getRecords().forEach(item -> {
-            if (item.getCreateBy() != null) {
-                item.setCreateByName(getUserNickname(item.getCreateBy()));
-            }
-            if (item.getUpdateBy() != null) {
-                item.setUpdateByName(getUserNickname(item.getUpdateBy()));
-            }
-        });
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 根据用户名获取用户昵称
-     * @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;
+        List<WmsDeliveryPlanVo> records = result.getRecords();
+        Set<String> userNames = records.stream()
+            .flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getUpdateBy()))
+            .filter(StringUtils::isNotBlank)
+            .collect(Collectors.toSet());
+        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()));
+                }
+            });
        }
-        // 找不到用户时返回原用户名
-        return username;
+        return TableDataInfo.build(result);
    }

    /**
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -286,14 +286,26 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
        QueryWrapper<WmsMaterialCoil> qw = buildQueryWrapperPlus(bo);
        Page<WmsMaterialCoilVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);

-        result.getRecords().forEach(item -> {
-            if (item.getCreateBy() != null) {
-                item.setCreateByName(getUserNickname(item.getCreateBy()));
-            }
-            if (item.getUpdateBy() != null) {
-                item.setUpdateByName(getUserNickname(item.getUpdateBy()));
-            }
-        });
+        List<WmsMaterialCoilVo> records = result.getRecords();
+        Set<String> userNames = records.stream()
+            .flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getUpdateBy()))
+            .filter(StringUtils::isNotBlank)
+            .collect(Collectors.toSet());
+        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()) {
@@ -350,25 +362,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
        qw.orderByDesc("mc.create_time");
        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;
-    }

    /**
     * 查询钢卷物料表列表