用户批量导入

paper-library-business/src/main/java/com/qmth/paper/library/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -33,6 +33,7 @@ import com.qmth.paper.library.common.service.SysUserService;
 import com.qmth.paper.library.common.util.*;
 import com.qmth.paper.library.common.util.excel.ExcelError;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.*;
 import org.slf4j.Logger;
@@ -135,25 +136,25 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 List<SysUserImportDto> duplicateData = new ArrayList<>();
                 for (int y = 0; y < Objects.requireNonNull(sysUserImportDtoList).size(); y++) {
                     SysUserImportDto sysUserImportDto = (SysUserImportDto) sysUserImportDtoList.get(y);
-                    String name = sysUserImportDto.getName().trim();
-                    String loginName = sysUserImportDto.getLoginName().trim();
-                    String phoneNumber = sysUserImportDto.getPhoneNumber().trim();
-                    String orgName = sysUserImportDto.getOrgName().trim();
-                    String roleName = sysUserImportDto.getRoleName().trim();
+                    String name = StringUtils.isNotBlank(sysUserImportDto.getName()) ? sysUserImportDto.getName().trim() : null;
+                    String loginName = StringUtils.isNotBlank(sysUserImportDto.getLoginName()) ? sysUserImportDto.getLoginName().trim() : null;
+//                    String phoneNumber = StringUtils.isNotBlank(sysUserImportDto.getPhoneNumber()) ? sysUserImportDto.getPhoneNumber().trim() : null;
+                    String orgName = StringUtils.isNotBlank(sysUserImportDto.getOrgName()) ? sysUserImportDto.getOrgName().trim() : null;
+                    String roleName = StringUtils.isNotBlank(sysUserImportDto.getRoleName()) ? sysUserImportDto.getRoleName().trim() : null;
 
                     if (checkDtoMap.containsKey(loginName)) {
                         SysUserImportDto primaryCell = checkDtoMap.get(loginName);
                         String priName = primaryCell.getName();
-                        String priPhoneNumber = primaryCell.getPhoneNumber();
+//                        String priPhoneNumber = primaryCell.getPhoneNumber();
                         String priOrgName = primaryCell.getOrgName();
                         if (!Objects.equals(priName, name)) {
-                            throw ExceptionResultEnum.ERROR.exception("【账号】 ：" + loginName + "的用户存在不同的名称");
-                        }
-                        if (!Objects.equals(priPhoneNumber, phoneNumber)) {
-                            throw ExceptionResultEnum.ERROR.exception("【账号】 ：" + loginName + "的用户存在不同的手机号");
+                            throw ExceptionResultEnum.ERROR.exception("【用户名】 ：" + loginName + "的用户存在不同的名称");
                         }
+//                        if (!Objects.equals(priPhoneNumber, phoneNumber)) {
+//                            throw ExceptionResultEnum.ERROR.exception("【账号】 ：" + loginName + "的用户存在不同的手机号");
+//                        }
                         if (!Objects.equals(priOrgName, orgName)) {
-                            throw ExceptionResultEnum.ERROR.exception("【账号】 ：" + loginName + "的用户存在不同的组织架构");
+                            throw ExceptionResultEnum.ERROR.exception("【用户名】 ：" + loginName + "的用户存在不同的组织架构");
                         }
                         String priRoleName = primaryCell.getRoleName();
                         if (SystemConstant.strNotNull(roleName)) {
@@ -172,9 +173,9 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     if (Objects.isNull(name) || name.length() > 30) {
                         excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[姓名]不符合输入规范"));
                     }
-                    if (Objects.nonNull(phoneNumber) && !phoneNumber.matches(SystemConstant.REGULAR_EXPRESSION_OF_PHONE)) {
-                        excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[电话号码]不符合输入规范"));
-                    }
+//                    if (Objects.nonNull(phoneNumber) && !phoneNumber.matches(SystemConstant.REGULAR_EXPRESSION_OF_PHONE)) {
+//                        excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[电话号码]不符合输入规范"));
+//                    }
                 }
                 sysUserImportDtoList.removeAll(duplicateData);
             }

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/dto/excel/SysUserImportDto.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @ExcelImportTempleteVaild(value = true)
 public class SysUserImportDto implements Serializable {
 
-    @ExcelNote(value = "账号")
+    @ExcelNote(value = "用户名")
     @NotNull
     private String loginName;
 
@@ -22,8 +22,8 @@ public class SysUserImportDto implements Serializable {
     @NotNull
     private String name;
 
-    @ExcelNote(value = "手机号")
-    private String phoneNumber;
+//    @ExcelNote(value = "手机号")
+//    private String phoneNumber;
 
     @ExcelNote(value = "组织架构")
     @NotNull
@@ -49,13 +49,13 @@ public class SysUserImportDto implements Serializable {
         this.name = name;
     }
 
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
+//    public String getPhoneNumber() {
+//        return phoneNumber;
+//    }
+//
+//    public void setPhoneNumber(String phoneNumber) {
+//        this.phoneNumber = phoneNumber;
+//    }
 
     public String getOrgName() {
         return orgName;

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/SysUserServiceImpl.java

@@ -138,7 +138,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 for (SysUserImportDto sysUserImportDto : datasource) {
                     String name = sysUserImportDto.getName();
                     String loginName = sysUserImportDto.getLoginName();
-                    String phoneNumber = sysUserImportDto.getPhoneNumber();
+//                    String phoneNumber = sysUserImportDto.getPhoneNumber();
                     String orgName = sysUserImportDto.getOrgName();
                     if (!orgInfoMap.containsKey(orgName)) {
                         throw ExceptionResultEnum.ERROR.exception("在解析的机构map集合中，没有找到excel数据中的用户机构名称【" + orgName + "】");
@@ -168,9 +168,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     userSaveParams.setRealName(name);
                     userSaveParams.setLoginName(loginName);
                     userSaveParams.setRoleIds(roleIdList.toArray(new Long[0]));
-                    if (SystemConstant.strNotNull(phoneNumber)) {
-                        userSaveParams.setMobileNumber(phoneNumber);
-                    }
+//                    if (SystemConstant.strNotNull(phoneNumber)) {
+//                        userSaveParams.setMobileNumber(phoneNumber);
+//                    }
                     userSaveParams.setCode(code);
                     userSaveParams.setSchoolId(schoolId);
                     Long upUserId = this.saveUserCommon(userSaveParams, requestUser.getId());