2424import top .cadecode .uniboot .system .bean .vo .SysRoleVo .SysRoleListVo ;
2525import top .cadecode .uniboot .system .bean .vo .SysUserVo .SysUserRolesVo ;
2626import top .cadecode .uniboot .system .convert .SysRoleConvert ;
27- import top .cadecode .uniboot .system .request .SysUserRequest .SysUserModifyInfoRequest ;
28- import top .cadecode .uniboot .system .request .SysUserRequest .SysUserModifyPassRequest ;
29- import top .cadecode .uniboot .system .request .SysUserRequest .SysUserRolesRequest ;
27+ import top .cadecode .uniboot .system .convert .SysUserConvert ;
3028import top .cadecode .uniboot .system .service .SysApiService ;
3129import top .cadecode .uniboot .system .service .SysMenuService ;
3230import top .cadecode .uniboot .system .service .SysRoleService ;
3331import top .cadecode .uniboot .system .service .SysUserService ;
3432
3533import javax .validation .Valid ;
34+ import javax .validation .constraints .NotEmpty ;
3635import java .util .List ;
3736
38- import static top .cadecode .uniboot .system .request .SysUserRequest .SysUserUpdateEnableRequest ;
37+ import static top .cadecode .uniboot .system .request .SysUserRequest .* ;
3938
4039/**
4140 * 系统管理API
@@ -70,7 +69,7 @@ public SysUserInfoDto userGetInfo() {
7069 return SysUserInfoDto .builder ().menuList (sysMenuTreeVos ).build ();
7170 }
7271
73- @ ApiOperation ("修改用户信息" )
72+ @ ApiOperation ("修改用户信息(用户中心) " )
7473 @ PostMapping ("user/modify_info" )
7574 public boolean userModifyInfo (@ RequestBody @ Valid SysUserModifyInfoRequest request ) {
7675 SysUserDetailsDto userDetails = TokenAuthHolder .getUserDetails (null );
@@ -83,7 +82,7 @@ public boolean userModifyInfo(@RequestBody @Valid SysUserModifyInfoRequest reque
8382 .update ();
8483 }
8584
86- @ ApiOperation ("修改用户密码" )
85+ @ ApiOperation ("修改用户密码(用户中心) " )
8786 @ PostMapping ("user/modify_pass" )
8887 public boolean userModifyPass (@ RequestBody @ Valid SysUserModifyPassRequest request ) {
8988 SysUserDetailsDto userDetails = TokenAuthHolder .getUserDetails (null );
@@ -112,12 +111,46 @@ public PageResult<SysUserRolesVo> userPageRolesVo(@RequestBody @Valid SysUserRol
112111 @ ApiOperation ("更新用户启用状态" )
113112 @ PostMapping ("user/update_enable" )
114113 public boolean userUpdateEnable (@ RequestBody @ Valid SysUserUpdateEnableRequest request ) {
115- return sysUserService .lambdaUpdate ()
114+ return sysUserService .lambdaUpdate ()
116115 .eq (SysUser ::getId , request .getId ())
117116 .set (SysUser ::getEnableFlag , request .getEnableFlag ())
118117 .update ();
119118 }
120119
120+ @ ApiOperation ("更新用户" )
121+ @ PostMapping ("user/update" )
122+ public boolean userUpdate (@ RequestBody @ Valid SysUserUpdateRequest request ) {
123+ String encodePass = null ;
124+ if (ObjectUtil .isNotEmpty (request .getPassword ())) {
125+ encodePass = passwordEncoder .encode (request .getPassword ());
126+ }
127+ return sysUserService .lambdaUpdate ()
128+ .eq (SysUser ::getId , request .getId ())
129+ .set (SysUser ::getUsername , request .getUsername ())
130+ .set (SysUser ::getNickName , request .getNickName ())
131+ .set (ObjectUtil .isNotEmpty (encodePass ), SysUser ::getPassword , encodePass )
132+ .set (SysUser ::getPhone , request .getPhone ())
133+ .set (SysUser ::getMail , request .getMail ())
134+ .set (SysUser ::getSex , request .getSex ())
135+ .update ();
136+ }
137+
138+ @ ApiOperation ("添加用户" )
139+ @ PostMapping ("user/add" )
140+ public boolean userAdd (@ RequestBody @ Valid SysUserAddRequest request ) {
141+ if (ObjectUtil .isNotEmpty (request .getPassword ())) {
142+ request .setPassword (passwordEncoder .encode (request .getPassword ()));
143+ }
144+ SysUser sysUser = SysUserConvert .INSTANCE .requestToPo (request );
145+ return sysUserService .save (sysUser );
146+ }
147+
148+ @ ApiOperation ("删除用户(多选)" )
149+ @ PostMapping ("user/delete" )
150+ public boolean userDelete (@ RequestBody @ NotEmpty List <Long > userIdList ) {
151+ return sysUserService .removeBatchByIds (userIdList );
152+ }
153+
121154 @ ApiOperation ("查询角色列表" )
122155 @ PostMapping ("role/list" )
123156 public List <SysRoleListVo > roleList () {
0 commit comments