✨ CRM：code review 客户导出的实现

yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/enums/ExcelColumn.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.framework.excel.core.enums;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+// TODO @puhui999：列表有办法通过 field name 么？主要考虑一个点，可能导入模版的顺序可能会变
 /**
  * Excel 列名枚举
  * 默认枚举 26 列列名如果有需求更多的列名请自行补充
@@ -12,6 +13,7 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum ExcelColumn {
+
     A(0), B(1), C(2), D(3), E(4), F(5), G(6), H(7), I(8),
     J(9), K(10), L(11), M(12), N(13), O(14), P(15), Q(16),
     R(17), S(18), T(19), U(20), V(21), W(22), X(23), Y(24),

yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/SelectSheetWriteHandler.java

@@ -23,9 +23,20 @@ import java.util.stream.Collectors;
  */
 public class SelectSheetWriteHandler implements SheetWriteHandler {
 
+    /**
+     * 数据起始行从 0 开始
+     *
+     * 约定：本项目第一行有标题所以从 1 开始如果您的 Excel 有多行标题请自行更改
+     */
+    public static final int FIRST_ROW = 1;
+    /**
+     * 下拉列需要创建下拉框的行数，默认两千行如需更多请自行调整
+     */
+    public static final int LAST_ROW = 2000;
+
     private static final String DICT_SHEET_NAME = "字典sheet";
-    public static final int FIRST_ROW = 1; // 数据起始行从 0 开始，本项目第一行有标题所以从 1 开始如果您的 Excel 有多行标题请自行更改
-    public static final int LAST_ROW = 2000; // 下拉列需要创建下拉框的行数，默认两千行如需更多请自行调整
+
+    // TODO @puhui999：Map<ExcelColumn, List<String>> 可以么？之前用 keyvalue 的原因，返回给前端，无法用 linkedhashmap，默认 key 会乱序
     private final List<KeyValue<ExcelColumn, List<String>>> selectMap;
 
     public SelectSheetWriteHandler(List<KeyValue<ExcelColumn, List<String>>> selectMap) {
@@ -48,32 +59,32 @@ public class SelectSheetWriteHandler implements SheetWriteHandler {
             return;
         }
 
-        // 1.1 获取相应操作对象
+        // 1. 获取相应操作对象
         DataValidationHelper helper = writeSheetHolder.getSheet().getDataValidationHelper(); // 需要设置下拉框的 sheet 页的数据验证助手
         Workbook workbook = writeWorkbookHolder.getWorkbook(); // 获得工作簿
 
-        // 1.2 创建数据字典的 sheet 页
+        // 2. 创建数据字典的 sheet 页
         Sheet dictSheet = workbook.createSheet(DICT_SHEET_NAME);
         for (KeyValue<ExcelColumn, List<String>> keyValue : selectMap) {
-            int rowLen = keyValue.getValue().size();
-            // 设置字典 sheet 页的值 每一列一个字典项
-            for (int i = 0; i < rowLen; i++) {
+            int rowLength = keyValue.getValue().size();
+            // 2.1 设置字典 sheet 页的值 每一列一个字典项
+            for (int i = 0; i < rowLength; i++) {
                 Row row = dictSheet.getRow(i);
                 if (row == null) {
                     row = dictSheet.createRow(i);
                 }
                 row.createCell(keyValue.getKey().getColNum()).setCellValue(keyValue.getValue().get(i));
             }
-            // 1.3 设置单元格下拉选择
-            setColSelect(writeSheetHolder, workbook, helper, keyValue);
+            // 2.2 设置单元格下拉选择
+            setColumnSelect(writeSheetHolder, workbook, helper, keyValue);
         }
     }
 
     /**
      * 设置单元格下拉选择
      */
-    private static void setColSelect(WriteSheetHolder writeSheetHolder, Workbook workbook, DataValidationHelper helper,
-                                     KeyValue<ExcelColumn, List<String>> keyValue) {
+    private static void setColumnSelect(WriteSheetHolder writeSheetHolder, Workbook workbook, DataValidationHelper helper,
+                                        KeyValue<ExcelColumn, List<String>> keyValue) {
         // 1.1 创建可被其他单元格引用的名称
         Name name = workbook.createName();
         String excelColumn = keyValue.getKey().name();
@@ -81,6 +92,7 @@ public class SelectSheetWriteHandler implements SheetWriteHandler {
         String refers = DICT_SHEET_NAME + "!$" + excelColumn + "$1:$" + excelColumn + "$" + keyValue.getValue().size();
         name.setNameName("dict" + keyValue.getKey()); // 设置名称的名字
         name.setRefersToFormula(refers); // 设置公式
+
         // 2.1 设置约束
         DataValidationConstraint constraint = helper.createFormulaListConstraint("dict" + keyValue.getKey()); // 设置引用约束
         // 设置下拉单元格的首行、末行、首列、末列

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java

@@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.crm.controller.admin.permission;
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionCreateReqVO;
 import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionRespVO;
 import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionUpdateReqVO;
-import cn.iocoder.yudao.module.crm.convert.permission.CrmPermissionConvert;
 import cn.iocoder.yudao.module.crm.dal.dataobject.permission.CrmPermissionDO;
 import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
 import cn.iocoder.yudao.module.crm.framework.permission.core.annotations.CrmPermission;
@@ -19,6 +19,7 @@ import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.dept.dto.PostRespDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.google.common.collect.Multimaps;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -29,11 +30,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Stream;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSetByFlatMap;
+import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - CRM 数据权限")
@@ -98,18 +104,32 @@ public class CrmPermissionController {
     @PreAuthorize("@ss.hasPermission('crm:permission:query')")
     public CommonResult<List<CrmPermissionRespVO>> getPermissionList(@RequestParam("bizType") Integer bizType,
                                                                      @RequestParam("bizId") Long bizId) {
-        List<CrmPermissionDO> permission = permissionService.getPermissionListByBiz(bizType, bizId);
-        if (CollUtil.isEmpty(permission)) {
+        List<CrmPermissionDO> permissions = permissionService.getPermissionListByBiz(bizType, bizId);
+        if (CollUtil.isEmpty(permissions)) {
             return success(Collections.emptyList());
         }
 
+        // 查询相关数据
+        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+                convertSet(permissions, CrmPermissionDO::getUserId));
+        Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
+        Map<Long, PostRespDTO> postMap = postApi.getPostMap(
+                convertSetByFlatMap(userMap.values(), AdminUserRespDTO::getPostIds,
+                        item -> item != null ? item.stream() : Stream.empty()));
         // 拼接数据
-        List<AdminUserRespDTO> userList = adminUserApi.getUserList(convertSet(permission, CrmPermissionDO::getUserId));
-        Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userList, AdminUserRespDTO::getDeptId));
-        Set<Long> postIds = CollectionUtils.convertSetByFlatMap(userList, AdminUserRespDTO::getPostIds,
-                item -> item != null ? item.stream() : Stream.empty());
-        Map<Long, PostRespDTO> postMap = postApi.getPostMap(postIds);
-        return success(CrmPermissionConvert.INSTANCE.convert(permission, userList, deptMap, postMap));
+        return success(CollectionUtils.convertList(BeanUtils.toBean(permissions, CrmPermissionRespVO.class), item -> {
+            findAndThen(userMap, item.getUserId(), user -> {
+                item.setNickname(user.getNickname());
+                findAndThen(deptMap, user.getDeptId(), deptRespDTO -> item.setDeptName(deptRespDTO.getName()));
+                if (CollUtil.isEmpty(user.getPostIds())) {
+                    item.setPostNames(Collections.emptySet());
+                    return;
+                }
+                List<PostRespDTO> postList = MapUtils.getList(Multimaps.forMap(postMap), user.getPostIds());
+                item.setPostNames(CollectionUtils.convertSet(postList, PostRespDTO::getName));
+            });
+            return item;
+        }));
     }
 
 }

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/permission/CrmPermissionConvert.java

@@ -1,57 +0,0 @@
-package cn.iocoder.yudao.module.crm.convert.permission;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionRespVO;
-import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionUpdateReqVO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.permission.CrmPermissionDO;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.dept.dto.PostRespDTO;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import com.google.common.collect.Multimaps;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
-
-// TODO @芋艿：要干掉
-/**
- * Crm 数据权限 Convert
- *
- * @author HUIHUI
- */
-@Mapper
-public interface CrmPermissionConvert {
-
-    CrmPermissionConvert INSTANCE = Mappers.getMapper(CrmPermissionConvert.class);
-
-    default List<CrmPermissionRespVO> convert(List<CrmPermissionDO> permissions, List<AdminUserRespDTO> userList,
-                                              Map<Long, DeptRespDTO> deptMap, Map<Long, PostRespDTO> postMap) {
-        Map<Long, AdminUserRespDTO> userMap = CollectionUtils.convertMap(userList, AdminUserRespDTO::getId);
-        return CollectionUtils.convertList(BeanUtils.toBean(permissions, CrmPermissionRespVO.class), item -> {
-            findAndThen(userMap, item.getUserId(), user -> {
-                item.setNickname(user.getNickname());
-                findAndThen(deptMap, user.getDeptId(), deptRespDTO -> item.setDeptName(deptRespDTO.getName()));
-                if (CollUtil.isEmpty(user.getPostIds())) {
-                    item.setPostNames(Collections.emptySet());
-                    return;
-                }
-                List<PostRespDTO> postList = MapUtils.getList(Multimaps.forMap(postMap), user.getPostIds());
-                item.setPostNames(CollectionUtils.convertSet(postList, PostRespDTO::getName));
-            });
-            return item;
-        });
-    }
-
-    default List<CrmPermissionDO> convertList(CrmPermissionUpdateReqVO updateReqVO) {
-        return CollectionUtils.convertList(updateReqVO.getIds(),
-                id -> new CrmPermissionDO().setId(id).setLevel(updateReqVO.getLevel()));
-    }
-
-}

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java

@@ -258,11 +258,13 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
     @Override
     public CrmCustomerImportRespVO importCustomerList(List<CrmCustomerImportExcelVO> importCustomers,
                                                       CrmCustomerImportReqVO importReqVO) {
+        // 校验非空
+        importCustomers = filterList(importCustomers, item -> Objects.nonNull(item.getName()));
         if (CollUtil.isEmpty(importCustomers)) {
             throw exception(CUSTOMER_IMPORT_LIST_IS_EMPTY);
         }
-        // 因为有下拉所以需要过滤掉空行
-        importCustomers = filterList(importCustomers, item -> Objects.nonNull(item.getName()));
+
+        // 逐条处理
         CrmCustomerImportRespVO respVO = CrmCustomerImportRespVO.builder().createCustomerNames(new ArrayList<>())
                 .updateCustomerNames(new ArrayList<>()).failureCustomerNames(new LinkedHashMap<>()).build();
         importCustomers.forEach(importCustomer -> {

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java

@@ -2,16 +2,16 @@ package cn.iocoder.yudao.module.crm.service.permission;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionUpdateReqVO;
-import cn.iocoder.yudao.module.crm.convert.permission.CrmPermissionConvert;
 import cn.iocoder.yudao.module.crm.dal.dataobject.permission.CrmPermissionDO;
 import cn.iocoder.yudao.module.crm.dal.mysql.permission.CrmPermissionMapper;
 import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
 import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
-import cn.iocoder.yudao.module.crm.util.CrmPermissionUtils;
 import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionCreateReqBO;
 import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionTransferReqBO;
+import cn.iocoder.yudao.module.crm.util.CrmPermissionUtils;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -74,8 +74,9 @@ public class CrmPermissionServiceImpl implements CrmPermissionService {
         // 1. 校验存在
         validatePermissionExists(updateReqVO.getIds());
         // 2. 更新
-        List<CrmPermissionDO> updateDO = CrmPermissionConvert.INSTANCE.convertList(updateReqVO);
-        permissionMapper.updateBatch(updateDO);
+        List<CrmPermissionDO> updateList = CollectionUtils.convertList(updateReqVO.getIds(),
+                id -> new CrmPermissionDO().setId(id).setLevel(updateReqVO.getLevel()));
+        permissionMapper.updateBatch(updateList);
     }
 
     private void validatePermissionExists(Collection<Long> ids) {