Merge pull request #6887 from dataease/pr@dev@feat_account_uid
feat: 内置账号转uid接口
This commit is contained in:
commit
92c6c26d4c
@ -17,10 +17,7 @@ import io.dataease.commons.utils.AuthUtils;
|
|||||||
import io.dataease.commons.utils.PageUtils;
|
import io.dataease.commons.utils.PageUtils;
|
||||||
import io.dataease.commons.utils.Pager;
|
import io.dataease.commons.utils.Pager;
|
||||||
import io.dataease.controller.response.ExistLdapUser;
|
import io.dataease.controller.response.ExistLdapUser;
|
||||||
import io.dataease.controller.sys.request.SysUserCreateRequest;
|
import io.dataease.controller.sys.request.*;
|
||||||
import io.dataease.controller.sys.request.SysUserPwdRequest;
|
|
||||||
import io.dataease.controller.sys.request.SysUserStateRequest;
|
|
||||||
import io.dataease.controller.sys.request.UserGridRequest;
|
|
||||||
import io.dataease.controller.sys.response.AuthBindDTO;
|
import io.dataease.controller.sys.response.AuthBindDTO;
|
||||||
import io.dataease.controller.sys.response.RoleUserItem;
|
import io.dataease.controller.sys.response.RoleUserItem;
|
||||||
import io.dataease.controller.sys.response.SysUserGridResponse;
|
import io.dataease.controller.sys.response.SysUserGridResponse;
|
||||||
@ -70,6 +67,16 @@ public class SysUserController {
|
|||||||
@Resource
|
@Resource
|
||||||
private AuthUserService authUserService;
|
private AuthUserService authUserService;
|
||||||
|
|
||||||
|
@ApiIgnore
|
||||||
|
@GetMapping("/transAccount")
|
||||||
|
public Long transAccount(@RequestBody TransAccountRequest request) {
|
||||||
|
String account = request.getAccount();
|
||||||
|
if (StringUtils.isBlank(account)) {
|
||||||
|
DEException.throwException("account can not be null");
|
||||||
|
}
|
||||||
|
return sysUserService.uidByAccount(account);
|
||||||
|
}
|
||||||
|
|
||||||
@ApiOperation("查询用户")
|
@ApiOperation("查询用户")
|
||||||
@RequiresPermissions("user:read")
|
@RequiresPermissions("user:read")
|
||||||
@PostMapping("/userGrid/{goPage}/{pageSize}")
|
@PostMapping("/userGrid/{goPage}/{pageSize}")
|
||||||
|
|||||||
@ -0,0 +1,11 @@
|
|||||||
|
package io.dataease.controller.sys.request;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class TransAccountRequest implements Serializable {
|
||||||
|
|
||||||
|
private String account;
|
||||||
|
}
|
||||||
@ -11,4 +11,6 @@ public interface ExtSysUserMapper {
|
|||||||
List<String> ldapUserNames(Integer from);
|
List<String> ldapUserNames(Integer from);
|
||||||
|
|
||||||
String queryAdminEmail();
|
String queryAdminEmail();
|
||||||
|
|
||||||
|
Long queryUserId(String username);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -106,4 +106,8 @@
|
|||||||
from sys_user
|
from sys_user
|
||||||
where user_id = 1
|
where user_id = 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="queryUserId" resultType="java.lang.Long" parameterType="java.lang.String">
|
||||||
|
select user_id from sys_user where username = #{account}
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
@ -63,6 +63,10 @@ public class SysUserService {
|
|||||||
@Resource
|
@Resource
|
||||||
private AuthUserService authUserService;
|
private AuthUserService authUserService;
|
||||||
|
|
||||||
|
public Long uidByAccount(String account) {
|
||||||
|
return extSysUserMapper.queryUserId(account);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public List<SysUserGridResponse> query(UserGridRequest request) {
|
public List<SysUserGridResponse> query(UserGridRequest request) {
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user