更改接口字段名称；
This commit is contained in:
terrfly
parent
7de741c9c3
commit
d0612061b8
|
|
@ -50,12 +50,12 @@ public class SysEntController extends CommonCtrl {
|
|||
|
||||
/** getOne */
|
||||
@PreAuthorize("hasAnyAuthority( 'ENT_UR_ROLE_ENT_LIST' )")
|
||||
@RequestMapping(value="/bySystem", method = RequestMethod.GET)
|
||||
@RequestMapping(value="/bySysType", method = RequestMethod.GET)
|
||||
public ApiRes bySystem() {
|
||||
|
||||
return ApiRes.ok(sysEntitlementService.getOne(SysEntitlement.gw()
|
||||
.eq(SysEntitlement::getEntId, getValStringRequired("entId"))
|
||||
.eq(SysEntitlement::getSysType, getValStringRequired("system")))
|
||||
.eq(SysEntitlement::getSysType, getValStringRequired("sysType")))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ public class SysEntController extends CommonCtrl {
|
|||
public ApiRes showTree() {
|
||||
|
||||
//查询全部数据
|
||||
List<SysEntitlement> list = sysEntitlementService.list(SysEntitlement.gw().eq(SysEntitlement::getSysType, getValStringRequired("system")));
|
||||
List<SysEntitlement> list = sysEntitlementService.list(SysEntitlement.gw().eq(SysEntitlement::getSysType, getValStringRequired("sysType")));
|
||||
|
||||
//转换为json树状结构
|
||||
JSONArray jsonArray = (JSONArray) JSONArray.toJSON(list);
|
||||
|
|
|
|||
|
|
@ -41,19 +41,19 @@ public class SysRoleEntRelaService extends ServiceImpl<SysRoleEntRelaMapper, Sys
|
|||
@Autowired private SysEntitlementService sysEntitlementService;
|
||||
|
||||
/** 根据人查询出所有权限ID集合 */
|
||||
public List<String> selectEntIdsByUserId(Long userId, Byte isAdmin, String system){
|
||||
public List<String> selectEntIdsByUserId(Long userId, Byte isAdmin, String sysType){
|
||||
|
||||
|
||||
if(isAdmin == CS.YES){
|
||||
|
||||
List<String> result = new ArrayList<>();
|
||||
sysEntitlementService.list(SysEntitlement.gw().select(SysEntitlement::getEntId).eq(SysEntitlement::getSysType, system).eq(SysEntitlement::getState, CS.PUB_USABLE)
|
||||
sysEntitlementService.list(SysEntitlement.gw().select(SysEntitlement::getEntId).eq(SysEntitlement::getSysType, sysType).eq(SysEntitlement::getState, CS.PUB_USABLE)
|
||||
).stream().forEach(r -> result.add(r.getEntId()));
|
||||
|
||||
return result;
|
||||
|
||||
}else{
|
||||
return baseMapper.selectEntIdsByUserId(userId, system);
|
||||
return baseMapper.selectEntIdsByUserId(userId, sysType);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,25 +40,25 @@ import java.util.List;
|
|||
public class SysUserAuthService extends ServiceImpl<SysUserAuthMapper, SysUserAuth> {
|
||||
|
||||
/** 根据登录信息查询用户认证信息 **/
|
||||
public SysUserAuth selectByLogin(String identifier, Byte identityType, String system){
|
||||
return baseMapper.selectByLogin(identifier, identityType, system);
|
||||
public SysUserAuth selectByLogin(String identifier, Byte identityType, String sysType){
|
||||
return baseMapper.selectByLogin(identifier, identityType, sysType);
|
||||
}
|
||||
|
||||
/** 添加用户认证表 **/
|
||||
@Transactional
|
||||
public void addUserAuthDefault(Long userId, String loginUserName, String telPhone, String pwdRaw, String system){
|
||||
public void addUserAuthDefault(Long userId, String loginUserName, String telPhone, String pwdRaw, String sysType){
|
||||
|
||||
String salt = StringKit.getUUID(6); //6位随机数
|
||||
String userPwd = new BCryptPasswordEncoder().encode(pwdRaw);
|
||||
|
||||
/** 用户名登录方式 */
|
||||
SysUserAuth record = new SysUserAuth(); record.setUserId(userId); record.setCredential(userPwd); record.setSalt(salt);record.setSysType(system);
|
||||
SysUserAuth record = new SysUserAuth(); record.setUserId(userId); record.setCredential(userPwd); record.setSalt(salt);record.setSysType(sysType);
|
||||
record.setIdentityType(CS.AUTH_TYPE.LOGIN_USER_NAME);
|
||||
record.setIdentifier(loginUserName);
|
||||
save(record);
|
||||
|
||||
/** 手机号登录方式 */
|
||||
record = new SysUserAuth(); record.setUserId(userId); record.setCredential(userPwd); record.setSalt(salt);record.setSysType(system);
|
||||
record = new SysUserAuth(); record.setUserId(userId); record.setCredential(userPwd); record.setSalt(salt);record.setSysType(sysType);
|
||||
record.setIdentityType(CS.AUTH_TYPE.TELPHONE);
|
||||
record.setIdentifier(telPhone);
|
||||
save(record);
|
||||
|
|
@ -67,7 +67,7 @@ public class SysUserAuthService extends ServiceImpl<SysUserAuthMapper, SysUserAu
|
|||
|
||||
/** 重置密码 */
|
||||
@Transactional
|
||||
public void resetAuthInfo(Long resetUserId, String authLoginUserName, String telphone, String newPwd, String system){
|
||||
public void resetAuthInfo(Long resetUserId, String authLoginUserName, String telphone, String newPwd, String sysType){
|
||||
|
||||
//更改登录用户名
|
||||
// if(StringKit.isNotEmpty(authLoginUserName)){
|
||||
|
|
@ -86,7 +86,7 @@ public class SysUserAuthService extends ServiceImpl<SysUserAuthMapper, SysUserAu
|
|||
//更改密码
|
||||
if(StringUtils.isNotEmpty(newPwd)){
|
||||
//根据当前用户ID 查询出用户的所有认证记录
|
||||
List<SysUserAuth> authList = list(SysUserAuth.gw().eq(SysUserAuth::getSysType, system).eq(SysUserAuth::getUserId, resetUserId));
|
||||
List<SysUserAuth> authList = list(SysUserAuth.gw().eq(SysUserAuth::getSysType, sysType).eq(SysUserAuth::getUserId, resetUserId));
|
||||
for (SysUserAuth auth : authList) {
|
||||
if(StringUtils.isEmpty(auth.getSalt())){ //可能为其他登录方式， 不存在salt
|
||||
continue;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUser> {
|
|||
|
||||
/** 添加系统用户 **/
|
||||
@Transactional
|
||||
public void addSysUser(SysUser sysUser, String system){
|
||||
public void addSysUser(SysUser sysUser, String sysType){
|
||||
|
||||
//判断获取到选择的角色集合
|
||||
// String roleIdListStr = sysUser.extv().getString("roleIdListStr");
|
||||
|
|
@ -62,15 +62,15 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUser> {
|
|||
if(sysUser.getSex() == null ) throw new BizException("性别不能为空！");
|
||||
|
||||
//登录用户名不可重复
|
||||
if( count(SysUser.gw().eq(SysUser::getSysType, system).eq(SysUser::getLoginUsername, sysUser.getLoginUsername())) > 0 ){
|
||||
if( count(SysUser.gw().eq(SysUser::getSysType, sysType).eq(SysUser::getLoginUsername, sysUser.getLoginUsername())) > 0 ){
|
||||
throw new BizException("登录用户名已存在！");
|
||||
}
|
||||
//手机号不可重复
|
||||
if( count(SysUser.gw().eq(SysUser::getSysType, system).eq(SysUser::getTelphone, sysUser.getTelphone())) > 0 ){
|
||||
if( count(SysUser.gw().eq(SysUser::getSysType, sysType).eq(SysUser::getTelphone, sysUser.getTelphone())) > 0 ){
|
||||
throw new BizException("手机号已存在！");
|
||||
}
|
||||
//员工号不可重复
|
||||
if( count(SysUser.gw().eq(SysUser::getSysType, system).eq(SysUser::getUserNo, sysUser.getUserNo())) > 0 ){
|
||||
if( count(SysUser.gw().eq(SysUser::getSysType, sysType).eq(SysUser::getUserNo, sysUser.getUserNo())) > 0 ){
|
||||
throw new BizException("员工号已存在！");
|
||||
}
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUser> {
|
|||
}
|
||||
|
||||
//1. 插入用户主表
|
||||
sysUser.setSysType(system); // 系统类型
|
||||
sysUser.setSysType(sysType); // 系统类型
|
||||
this.save(sysUser);
|
||||
|
||||
Long sysUserId = sysUser.getSysUserId();
|
||||
|
|
@ -90,7 +90,7 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUser> {
|
|||
//添加到 user_auth表
|
||||
String authPwd = CS.DEFAULT_PWD;
|
||||
|
||||
sysUserAuthService.addUserAuthDefault(sysUserId, sysUser.getLoginUsername(), sysUser.getTelphone(), authPwd, system);
|
||||
sysUserAuthService.addUserAuthDefault(sysUserId, sysUser.getLoginUsername(), sysUser.getTelphone(), authPwd, sysType);
|
||||
|
||||
//3. 添加用户角色信息
|
||||
//saveUserRole(sysUser.getSysUserId(), new ArrayList<>());
|
||||
|
|
|
|||
Loading…
Reference in New Issue