diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/CpUserExcelVo.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/CpUserExcelVo.java index 27bb8dae9..0429bfbda 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/CpUserExcelVo.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/CpUserExcelVo.java @@ -21,7 +21,6 @@ public class CpUserExcelVo implements Serializable { @ExcelIgnore private Long lineNum; - @NotBlank(message = "帐号不能为空") @ExcelProperty("帐号") private String username; @@ -33,7 +32,6 @@ public class CpUserExcelVo implements Serializable { @ExcelProperty("手机") private String phone; - /** * 姓名 */ @@ -41,7 +39,6 @@ public class CpUserExcelVo implements Serializable { @ExcelProperty("姓名") private String name; - /** * 别名 */ @@ -55,14 +52,9 @@ public class CpUserExcelVo implements Serializable { @ExcelProperty("部门") private String deptName; - @ExcelProperty("企业邮箱") private String email; - - - - /** * 锁定标记 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVo.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVo.java index dc11ff62c..ea3427291 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVo.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVo.java @@ -14,6 +14,7 @@ import java.io.Serializable; */ @Data public class DeptExcelVo implements Serializable { + /** * 导入时候回显行号 */ @@ -28,7 +29,6 @@ public class DeptExcelVo implements Serializable { @ExcelProperty("上级部门") private String parentName; - /** * 部门名称 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DingUserExcelVo.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DingUserExcelVo.java index 2e2852808..596ce2b63 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DingUserExcelVo.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DingUserExcelVo.java @@ -18,7 +18,6 @@ public class DingUserExcelVo implements Serializable { @ExcelIgnore private Long lineNum; - /** * 手机号 */ @@ -26,7 +25,6 @@ public class DingUserExcelVo implements Serializable { @ExcelProperty("手机号") private String phone; - /** * 姓名 */ @@ -34,7 +32,6 @@ public class DingUserExcelVo implements Serializable { @ExcelProperty("姓名") private String name; - /** * 部门名称 */ @@ -42,14 +39,9 @@ public class DingUserExcelVo implements Serializable { @ExcelProperty("部门") private String deptName; - @ExcelProperty("邮箱") private String email; - - - - /** * 锁定标记 */ diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java index 9c9abd45f..131e480be 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java @@ -134,18 +134,16 @@ public class SysDeptController { relationService.list(Wrappers.lambdaQuery().eq(SysDeptRelation::getAncestor, deptId))); } - /** * 导出部门 * @return */ @ResponseExcel @GetMapping("/export") - public List export(){ + public List export() { return sysDeptService.listExcelVo(); } - /** * 导入部门 * @param excelVOList @@ -153,8 +151,9 @@ public class SysDeptController { * @return */ @PostMapping("import") - public R importDept(@RequestExcel List excelVOList, BindingResult bindingResult){ + public R importDept(@RequestExcel List excelVOList, BindingResult bindingResult) { - return sysDeptService.importDept(excelVOList,bindingResult); + return sysDeptService.importDept(excelVOList, bindingResult); } + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java index 6fc2c1891..96fcb4cac 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java @@ -215,7 +215,6 @@ public class SysUserController { return userService.importUser(excelVOList, bindingResult); } - /** * 导入钉钉用户 * @param excelVOList @@ -223,14 +222,13 @@ public class SysUserController { * @return */ @PostMapping("/importDingUser") - public R importDingUser(@RequestExcel List excelVOList, BindingResult bindingResult){ - return userService.importDingUser(excelVOList,bindingResult); + public R importDingUser(@RequestExcel List excelVOList, BindingResult bindingResult) { + return userService.importDingUser(excelVOList, bindingResult); } - @PostMapping("/importCpUser") - public R importCpUser(@RequestExcel List excelVOList, BindingResult bindingResult){ - return userService.importCpUser(excelVOList,bindingResult); + public R importCpUser(@RequestExcel List excelVOList, BindingResult bindingResult) { + return userService.importCpUser(excelVOList, bindingResult); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java index 4ff719379..09c736c8d 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java @@ -69,4 +69,5 @@ public interface SysDeptService extends IService { List listExcelVo(); R importDept(List excelVOList, BindingResult bindingResult); + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java index 55cfdf642..5f5a441a8 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java @@ -129,4 +129,5 @@ public interface SysUserService extends IService { R importDingUser(List excelVOList, BindingResult bindingResult); R importCpUser(List excelVOList, BindingResult bindingResult); + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java index 934f21fd7..cbd2bc060 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java @@ -143,15 +143,14 @@ public class SysDeptServiceImpl extends ServiceImpl impl List errorMessageList = (List) bindingResult.getTarget(); List deptList = this.list(); - for (DeptExcelVo item: excelVOList){ + for (DeptExcelVo item : excelVOList) { Set errorMsg = new HashSet<>(); - boolean exsitUsername = deptList.stream() - .anyMatch(sysDept -> item.getName().equals(sysDept.getName())); + boolean exsitUsername = deptList.stream().anyMatch(sysDept -> item.getName().equals(sysDept.getName())); if (exsitUsername) { errorMsg.add("部门名称已经存在"); } SysDept one = this.getOne(Wrappers.lambdaQuery().eq(SysDept::getName, item.getParentName())); - if(item.getParentName().equals("跟部门")){ + if (item.getParentName().equals("跟部门")) { one = new SysDept(); one.setDeptId(0L); } @@ -164,7 +163,8 @@ public class SysDeptServiceImpl extends ServiceImpl impl sysDept.setParentId(one.getDeptId()); sysDept.setSortOrder(item.getSortOrder()); this.saveDept(sysDept); - }else{ + } + else { // 数据不合法情况 errorMessageList.add(new ErrorMessage(item.getLineNum(), errorMsg)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index d8f41a115..546370663 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -398,7 +398,6 @@ public class SysUserServiceImpl extends ServiceImpl impl return R.ok(); } - @Override public R importDingUser(List excelVOList, BindingResult bindingResult) { List errorMessageList = (List) bindingResult.getTarget(); @@ -406,24 +405,22 @@ public class SysUserServiceImpl extends ServiceImpl impl List userList = this.list(); List deptList = sysDeptService.list(); - for (DingUserExcelVo item: excelVOList){ + for (DingUserExcelVo item : excelVOList) { Set errorMsg = new HashSet<>(); - boolean exsitUser = userList.stream() - .anyMatch(sysUser -> item.getName().equals(sysUser.getName())); + boolean exsitUser = userList.stream().anyMatch(sysUser -> item.getName().equals(sysUser.getName())); if (exsitUser) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_USER_USERNAME_EXISTING, item.getName())); } // 删除手机号中的 +86 前缀 String phone = item.getPhone().split("-")[1]; - boolean exsitPhone = userList.stream() - .anyMatch(sysUser -> phone.equals(sysUser.getPhone())); + boolean exsitPhone = userList.stream().anyMatch(sysUser -> phone.equals(sysUser.getPhone())); if (exsitPhone) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING, item.getPhone())); } String deptName = item.getDeptName().split(",")[0]; // 判断输入的部门名称列表是否合法 - Optional deptOptional = deptList.stream() - .filter(dept -> deptName.equals(dept.getName())).findFirst(); + Optional deptOptional = deptList.stream().filter(dept -> deptName.equals(dept.getName())) + .findFirst(); if (!deptOptional.isPresent()) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_DEPT_DEPTNAME_INEXISTENCE, item.getDeptName())); } @@ -466,24 +463,23 @@ public class SysUserServiceImpl extends ServiceImpl impl List userList = this.list(); List deptList = sysDeptService.list(); - for (CpUserExcelVo item: excelVOList){ + for (CpUserExcelVo item : excelVOList) { Set errorMsg = new HashSet<>(); boolean exsitUsername = userList.stream() .anyMatch(sysUser -> item.getUsername().equals(sysUser.getUsername())); if (exsitUsername) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_USER_USERNAME_EXISTING, item.getUsername())); } - boolean exsitPhone = userList.stream() - .anyMatch(sysUser -> item.getPhone().equals(sysUser.getPhone())); + boolean exsitPhone = userList.stream().anyMatch(sysUser -> item.getPhone().equals(sysUser.getPhone())); if (exsitPhone) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING, item.getPhone())); } // 多部门获取第一个 到部门获取自己点 String[] deptNameList = item.getDeptName().split(";")[0].split("/"); - String deptName = deptNameList[deptNameList.length-1]; + String deptName = deptNameList[deptNameList.length - 1]; // 判断输入的部门名称列表是否合法 - Optional deptOptional = deptList.stream() - .filter(dept -> deptName.equals(dept.getName())).findFirst(); + Optional deptOptional = deptList.stream().filter(dept -> deptName.equals(dept.getName())) + .findFirst(); if (!deptOptional.isPresent()) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_DEPT_DEPTNAME_INEXISTENCE, deptName)); }