添加初始化账号功能
This commit is contained in:
parent
c81b9321e6
commit
3b32775cae
|
|
@ -61,7 +61,7 @@ public class WorkOrderMQListener {
|
|||
// var userInfo = { userName: record.tel, realname: record.name, orgCode: record.id, orgId: record.pkId }
|
||||
Map<String,String> map = new HashMap<>();
|
||||
map.put("userName", workOrderMQDto.getAccountNo());
|
||||
map.put("realname", "管理员");
|
||||
map.put("realName", "管理员");
|
||||
map.put("orgCode", workOrderMQDto.getId());
|
||||
map.put("orgId", workOrderMQDto.getOrgId());
|
||||
map.put("password", workOrderMQDto.getPasswordText());
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ import org.jeecg.common.api.vo.Result;
|
|||
import org.jeecg.common.system.api.ISysBaseAPI;
|
||||
import org.jeecg.common.system.entity.SysDepartEntity;
|
||||
import org.jeecg.common.util.PasswordUtil;
|
||||
import org.jeecg.modules.data.loader.DataSourceLoader;
|
||||
import org.jeecg.modules.message.entity.SysMessageTemplate;
|
||||
import org.jeecg.modules.message.handle.impl.DdSendMsgHandle;
|
||||
import org.jeecg.modules.message.handle.impl.EmailSendMsgHandle;
|
||||
|
|
@ -147,6 +148,9 @@ public class SysBaseApiImpl implements ISysBaseAPI {
|
|||
@Autowired
|
||||
private IDictTableWhiteListHandler dictTableWhiteListHandler;
|
||||
|
||||
@Autowired
|
||||
private DataSourceLoader dataSourceLoader;
|
||||
|
||||
@Override
|
||||
//@SensitiveDecode
|
||||
public LoginUser getUserByName(String username) {
|
||||
|
|
@ -2004,6 +2008,8 @@ public class SysBaseApiImpl implements ISysBaseAPI {
|
|||
String password = map.get("password");
|
||||
selectedDeparts = depart.getId();
|
||||
user.setOrgCode(depart.getOrgCode());
|
||||
user.setUsername(map.get("userName"));
|
||||
user.setRealname(map.get("realName"));
|
||||
user.setWorkNo(depart.getOrgCode()+random);
|
||||
user.setPassword(password);
|
||||
user.setCreateTime(new Date());//设置创建时间
|
||||
|
|
@ -2015,6 +2021,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
|
|||
user.setDelFlag(CommonConstant.DEL_FLAG_0);
|
||||
//用户表字段org_code不能在这里设置他的值
|
||||
user.setOrgCode(null);
|
||||
dataSourceLoader.refreshDataSources();
|
||||
// 保存用户走一个service 保证事务
|
||||
//获取租户ids
|
||||
String relTenantIds = map.get("relTenantIds");
|
||||
|
|
|
|||
|
|
@ -2023,6 +2023,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
@Override
|
||||
@DS("#dataSourceCode")
|
||||
public void saveUserInitialization(String dataSourceCode, SysUser user, String selectedRoles, String selectedDeparts, String relTenantIds) {
|
||||
System.out.println("保存用户初始化数据"+dataSourceCode);
|
||||
//step.1 保存用户
|
||||
this.save(user);
|
||||
//获取用户保存前台传过来的租户id并添加到租户
|
||||
|
|
|
|||
Loading…
Reference in New Issue