ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】用户表新增和导入时，id改为UUID自动生成。为后续IAM新增时，ID和IAM绑定做准备

Browse Source
This commit is contained in:
zer0Black
2023-09-29 21:49:57 +08:00
parent 61f9b134e8
commit 326d8441ed
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+4 -3
View File
@@ -568,13 +568,14 @@ public class SysUserController {
String salt = oConvertUtils.randomGen(8); String salt = oConvertUtils.randomGen(8);
sysUserExcel.setSalt(salt); sysUserExcel.setSalt(salt);
String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt); String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt);
sysUserExcel.setId(UUIDUtils.randomUUID(32));
sysUserExcel.setPassword(passwordEncode); sysUserExcel.setPassword(passwordEncode);
SuccessAndErrorLines successAndErrorLines = this.getSuccessAndErrorLines(errorMessage, successLines, errorLines, i, sysUserExcel); SuccessAndErrorLines successAndErrorLines = this.saveAndErrorLines(errorMessage, successLines, errorLines, i, sysUserExcel);
successLines = successAndErrorLines.getSuccessLines(); successLines = successAndErrorLines.getSuccessLines();
errorLines = successAndErrorLines.getErrorLines(); errorLines = successAndErrorLines.getErrorLines();
// 批量将部门和用户信息建立关联关系 TODO 错误需修改 // 批量将部门和用户信息建立关联关系 TODO 错误需修改
String departIds = sysUserExcel.getDepartIds(); String departIds = sysUserExcel.getDepartIds();
saveUser(sysUserExcel, departIds); this.saveUser(sysUserExcel, departIds);
} }
} catch (Exception e) { } catch (Exception e) {
@@ -601,7 +602,7 @@ public class SysUserController {
* @return * @return
*/ */
@NotNull @NotNull
private SuccessAndErrorLines getSuccessAndErrorLines(List<String> errorMessage, int successLines, int errorLines, int i, SysUser sysUserExcel) { private SuccessAndErrorLines saveAndErrorLines(List<String> errorMessage, int successLines, int errorLines, int i, SysUser sysUserExcel) {
SuccessAndErrorLines successAndErrorLines = new SuccessAndErrorLines(); SuccessAndErrorLines successAndErrorLines = new SuccessAndErrorLines();
successAndErrorLines.setSuccessLines(successLines); successAndErrorLines.setSuccessLines(successLines);
successAndErrorLines.setErrorLines(errorLines); successAndErrorLines.setErrorLines(errorLines);
laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class SysUser implements Serializable {
/** /**
* id * id
*/ */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.INPUT)
private String id; private String id;
/** /**
laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+2
View File
@@ -15,6 +15,7 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.system.vo.SysUserCacheInfo; import com.jero.common.system.vo.SysUserCacheInfo;
import com.jero.common.util.PasswordUtil; import com.jero.common.util.PasswordUtil;
import com.jero.common.util.UUIDGenerator; import com.jero.common.util.UUIDGenerator;
import com.jero.common.util.UUIDUtils;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.modules.base.service.BaseCommonService; import com.jero.modules.base.service.BaseCommonService;
import com.jero.modules.system.entity.*; import com.jero.modules.system.entity.*;
@@ -465,6 +466,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void saveUser(SysUser user, String selectedRoles, String selectedDeparts) { public void saveUser(SysUser user, String selectedRoles, String selectedDeparts) {
user.setId(UUIDUtils.randomUUID(32));
//step.1 保存用户 //step.1 保存用户
// 对手机号、邮箱进行加密处理 // 对手机号、邮箱进行加密处理
this.proceedUserInfoEncrypt(user); this.proceedUserInfoEncrypt(user);
laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java
-2
View File
@@ -20,8 +20,6 @@ public class FindsDepartsChildrenUtil {
private FindsDepartsChildrenUtil(){} private FindsDepartsChildrenUtil(){}
/** /**
* queryTreeList的子方法 ====1===== * queryTreeList的子方法 ====1=====
* 该方法是s将SysDepart类型的list集合转换成SysDepartTreeModel类型的集合 * 该方法是s将SysDepart类型的list集合转换成SysDepartTreeModel类型的集合