|
...
|
...
|
@@ -93,7 +93,7 @@ public class UserController { |
|
|
|
}
|
|
|
|
|
|
|
|
@LogAnnotation(moduleName = "用户管理",operate = "用户编辑")
|
|
|
|
@PutMapping("/edit")
|
|
|
|
@PostMapping("/edit")
|
|
|
|
public ResultJson updateUserById(@Validated(UpdateUser.class) @RequestBody KakoUser user){
|
|
|
|
user.setPassword(null);
|
|
|
|
int i = userService.updateByPrimaryKeySelective(user);
|
|
...
|
...
|
@@ -102,7 +102,7 @@ public class UserController { |
|
|
|
}
|
|
|
|
|
|
|
|
@LogAnnotation(moduleName = "用户锁定",operate = "用户锁定")
|
|
|
|
@PutMapping("/lock")
|
|
|
|
@PostMapping("/lock")
|
|
|
|
public ResultJson lockUserById(@Validated(UpdateUser.class) @RequestBody KakoUser user){
|
|
|
|
KakoUser kakoUser = new KakoUser();
|
|
|
|
kakoUser.setId(user.getId());
|
|
...
|
...
|
@@ -115,13 +115,14 @@ public class UserController { |
|
|
|
if (StringUtils.isNotEmpty(userTokenStr)){
|
|
|
|
redisUtils.del(userTokenStr);
|
|
|
|
}
|
|
|
|
log.info("用户锁定成功:key:{}",userTokenStr);
|
|
|
|
}
|
|
|
|
return i==1 ? new ResultJson("200","success") :new ResultJson("500","lock user faild");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
@LogAnnotation(moduleName = "用户管理",operate = "用户密码修改")
|
|
|
|
@PutMapping("/password")
|
|
|
|
@PostMapping("/password")
|
|
|
|
public ResultJson updateUserPassById(@RequestBody KakoUser user){
|
|
|
|
KakoUser kakoUser = new KakoUser();
|
|
|
|
kakoUser.setId(user.getId());
|
|
...
|
...
|
@@ -144,14 +145,14 @@ public class UserController { |
|
|
|
}
|
|
|
|
|
|
|
|
@LogAnnotation(moduleName = "用户管理",operate = "用户删除")
|
|
|
|
@DeleteMapping("/del")
|
|
|
|
@PostMapping("/del")
|
|
|
|
public ResultJson delUser(@RequestBody KakoUser user,HttpServletRequest request,HttpServletResponse response){
|
|
|
|
//String username = getusername();
|
|
|
|
int i = userService.deleteByPrimaryKey(user);
|
|
|
|
return i==1 ? new ResultJson("200","删除账户成功") :new ResultJson("500","delete faild");
|
|
|
|
}
|
|
|
|
|
|
|
|
@PutMapping("/roleset")
|
|
|
|
@PostMapping("/roleset")
|
|
|
|
public ResultJson roleSet(@RequestBody Map<String,Object> map,HttpServletRequest request,HttpServletResponse respons){
|
|
|
|
String id = map.get("userId").toString();
|
|
|
|
List<Integer> roles = (List<Integer>) map.get("roleIds");
|
|
...
|
...
|
@@ -167,7 +168,7 @@ public class UserController { |
|
|
|
*/
|
|
|
|
@ApiOperation(value = "更新用户权限缓存", notes = "重新生成用户的信息到redis")
|
|
|
|
@RedisCacheDelTarget(cacheKey = "com.tianbo.warehouse.service.imp.PermissionServiceImp")
|
|
|
|
@PutMapping("/resetToken")
|
|
|
|
@PostMapping("/resetToken")
|
|
|
|
public ResultJson resetToken(HttpServletRequest request,HttpServletResponse respons) {
|
|
|
|
/**
|
|
|
|
* 更新目标用户的权限缓存
|
...
|
...
|
|