diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 15614156..6e49b94d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -456,7 +456,7 @@ public class SysUserController { } userList.forEach(user -> { // 对手机号、邮箱进行解密处理 - sysUserService.proceedDecrypt(user); + sysUserService.proceedUserInfoDecrypt(user); }); try { @@ -488,7 +488,7 @@ public class SysUserController { IPage pageList = sysUserDepartService.queryDepartUserPageList(departId, username, realname, pageSize, pageNo); pageList.getRecords().forEach(user -> { // 对手机号、邮箱进行解密处理 - sysUserService.proceedDecrypt(user); + sysUserService.proceedUserInfoDecrypt(user); }); return Results.OK(pageList); } @@ -515,7 +515,7 @@ public class SysUserController { List pageList = sysUserService.list(queryWrapper); pageList.forEach(user -> { // 对手机号、邮箱进行解密处理 - sysUserService.proceedDecrypt(user); + sysUserService.proceedUserInfoDecrypt(user); }); //导出文件名称 @@ -565,7 +565,7 @@ public class SysUserController { sysUserExcel.setSalt(salt); String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt); sysUserExcel.setPassword(passwordEncode); - SuccessAndErrorLines successAndErrorLines = getSuccessAndErrorLines(errorMessage, successLines, errorLines, i, sysUserExcel); + SuccessAndErrorLines successAndErrorLines = this.getSuccessAndErrorLines(errorMessage, successLines, errorLines, i, sysUserExcel); successLines = successAndErrorLines.getSuccessLines(); errorLines = successAndErrorLines.getErrorLines(); // 批量将部门和用户信息建立关联关系 TODO 错误需修改 @@ -587,6 +587,15 @@ public class SysUserController { return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage); } + /** + * 校验，得到正确和错误的行数据 + * @param errorMessage + * @param successLines + * @param errorLines + * @param i + * @param sysUserExcel + * @return + */ @NotNull private SuccessAndErrorLines getSuccessAndErrorLines(List errorMessage, int successLines, int errorLines, int i, SysUser sysUserExcel) { SuccessAndErrorLines successAndErrorLines = new SuccessAndErrorLines(); @@ -594,7 +603,7 @@ public class SysUserController { successAndErrorLines.setErrorLines(errorLines); try { // 对手机号、邮箱进行加密处理 - sysUserService.proceedEncrypt(sysUserExcel); + sysUserService.proceedUserInfoEncrypt(sysUserExcel); sysUserService.save(sysUserExcel); successAndErrorLines.setSuccessLines(successLines + 1); } catch (Exception e) { @@ -607,6 +616,11 @@ public class SysUserController { return successAndErrorLines; } + /** + * 批量保存用户 + * @param sysUserExcel + * @param departIds + */ private void saveUser(SysUser sysUserExcel, String departIds) { if (StringUtils.isNotBlank(departIds)) { String userId = sysUserExcel.getId(); @@ -619,6 +633,13 @@ public class SysUserController { } } + /** + * 导入用户，行错误信息处理 + * @param errorMessage + * @param e + * @param message + * @param lineNumber + */ private void setErrorMessage(List errorMessage, Exception e, String message, int lineNumber) { if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_USERNAME) || message.contains(CommonConstant.SQL_INDEX_INDEX_USER_NAME)) { @@ -649,7 +670,7 @@ public class SysUserController { Collection idList = Arrays.asList(userId); Collection userRole = sysUserService.listByIds(idList); userRole.forEach(user -> { - sysUserService.proceedDecrypt(user); + sysUserService.proceedUserInfoDecrypt(user); }); result.setSuccess(true); result.setResult(userRole); @@ -700,7 +721,7 @@ public class SysUserController { String username = req.getParameter(USER_NAME); IPage pageList = sysUserService.getUserByRoleId(page,roleId,username); pageList.getRecords().forEach(user -> { - sysUserService.proceedDecrypt(user); + sysUserService.proceedUserInfoDecrypt(user); }); result.setSuccess(true); result.setResult(pageList); @@ -822,7 +843,7 @@ public class SysUserController { ); } pageList.getRecords().forEach(user -> { - sysUserService.proceedDecrypt(user); + sysUserService.proceedUserInfoDecrypt(user); }); result.setSuccess(true); result.setResult(pageList); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index fb527f3b..e5dfcf83 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -286,10 +286,10 @@ public interface ISysUserService extends IService { /** * @Remarks: 对手机号、邮箱进行解密处理 **/ - void proceedDecrypt(SysUser user); + void proceedUserInfoDecrypt(SysUser user); /** * @Remarks: 对手机号、邮箱进行加密处理 **/ - void proceedEncrypt(SysUser user); + void proceedUserInfoEncrypt(SysUser user); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 7186de85..cbb74f23 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Results; import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; -import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.SysUserCacheInfo; @@ -25,7 +24,6 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.vo.SysUserDepNameVo; import com.jero.modules.system.vo.SysUserRoleNameVo; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -70,7 +68,7 @@ public class SysUserServiceImpl extends ServiceImpl impl IPage sysUserIPage = this.userMapper.queryPage(page, subDepIds, roleId, queryWrapper); sysUserIPage.getRecords().forEach(user -> { // 对手机号、邮箱进行解密处理 - proceedDecrypt(user); + proceedUserInfoDecrypt(user); }); return sysUserIPage; } @@ -468,7 +466,7 @@ public class SysUserServiceImpl extends ServiceImpl impl public void saveUser(SysUser user, String selectedRoles, String selectedDeparts) { //step.1 保存用户 // 对手机号、邮箱进行加密处理 - proceedEncrypt(user); + this.proceedUserInfoEncrypt(user); this.save(user); //step.2 保存角色 if(oConvertUtils.isNotEmpty(selectedRoles)) { @@ -492,7 +490,7 @@ public class SysUserServiceImpl extends ServiceImpl impl * @Remarks: 对手机号、邮箱进行加密处理 **/ @Override - public void proceedEncrypt(SysUser user) { + public void proceedUserInfoEncrypt(SysUser user) { if (user == null) { return; } @@ -515,7 +513,7 @@ public class SysUserServiceImpl extends ServiceImpl impl * @Remarks: 对手机号、邮箱进行解密处理 **/ @Override - public void proceedDecrypt(SysUser user) { + public void proceedUserInfoDecrypt(SysUser user) { if (user == null) { return; } @@ -548,7 +546,7 @@ public class SysUserServiceImpl extends ServiceImpl impl public void editUser(SysUser user, String roles, String departs) { //step.1 修改用户基础信息 // 对手机号、邮箱进行加密处理 - proceedEncrypt(user); + this.proceedUserInfoEncrypt(user); this.updateById(user); //step.2 修改角色 //处理用户角色 先删后加 @@ -594,7 +592,7 @@ public class SysUserServiceImpl extends ServiceImpl impl public SysUser queryById(String id) { SysUser user = getById(id); // 对手机号、邮箱进行解密处理 - proceedDecrypt(user); + proceedUserInfoDecrypt(user); return user; }