|
@@ -32,7 +32,7 @@ public class UserController { |
|
@@ -32,7 +32,7 @@ public class UserController { |
|
32
|
@ApiOperation(value = "查询用户列表及信息", notes = "查询用户列表及单个用户信息")
|
32
|
@ApiOperation(value = "查询用户列表及信息", notes = "查询用户列表及单个用户信息")
|
|
33
|
@ApiImplicitParams({@ApiImplicitParam(name = "pageNum", value = "分页-当前页", required = false, dataType = "int",defaultValue = "1"),
|
33
|
@ApiImplicitParams({@ApiImplicitParam(name = "pageNum", value = "分页-当前页", required = false, dataType = "int",defaultValue = "1"),
|
|
34
|
@ApiImplicitParam(name = "pageSize", value = "分页-每页显示多少条", required = false, dataType = "int",defaultValue = "5")})
|
34
|
@ApiImplicitParam(name = "pageSize", value = "分页-每页显示多少条", required = false, dataType = "int",defaultValue = "5")})
|
|
35
|
- @GetMapping("/user/list")
|
35
|
+ @GetMapping("/list")
|
|
36
|
public PageInfo<USERS> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
|
36
|
public PageInfo<USERS> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
|
|
37
|
int pageNum,
|
37
|
int pageNum,
|
|
38
|
@RequestParam(value = "pageSize",required = false,defaultValue = "5")
|
38
|
@RequestParam(value = "pageSize",required = false,defaultValue = "5")
|
|
@@ -49,7 +49,7 @@ public class UserController { |
|
@@ -49,7 +49,7 @@ public class UserController { |
|
49
|
|
49
|
|
|
50
|
@LogAnnotation(moduleName = "用户管理",operate = "用户编辑")
|
50
|
@LogAnnotation(moduleName = "用户管理",operate = "用户编辑")
|
|
51
|
@UserPasswordMd5
|
51
|
@UserPasswordMd5
|
|
52
|
- @PutMapping("/user/edit")
|
52
|
+ @PutMapping("/edit")
|
|
53
|
public ResultJson updateUserById(@RequestBody @Valid USERS user){
|
53
|
public ResultJson updateUserById(@RequestBody @Valid USERS user){
|
|
54
|
int i = userService.updateByPrimaryKeySelective(user);
|
54
|
int i = userService.updateByPrimaryKeySelective(user);
|
|
55
|
ResultJson resultJson = new ResultJson();
|
55
|
ResultJson resultJson = new ResultJson();
|
|
@@ -59,7 +59,7 @@ public class UserController { |
|
@@ -59,7 +59,7 @@ public class UserController { |
|
59
|
|
59
|
|
|
60
|
@UserPasswordMd5
|
60
|
@UserPasswordMd5
|
|
61
|
@LogAnnotation(moduleName = "用户管理",operate = "用户添加")
|
61
|
@LogAnnotation(moduleName = "用户管理",operate = "用户添加")
|
|
62
|
- @PostMapping("/user/add")
|
62
|
+ @PostMapping("/add")
|
|
63
|
public ResultJson addUser(@RequestBody @Valid USERS user, HttpServletRequest request, HttpServletResponse response, BindingResult bindingResult){
|
63
|
public ResultJson addUser(@RequestBody @Valid USERS user, HttpServletRequest request, HttpServletResponse response, BindingResult bindingResult){
|
|
64
|
|
64
|
|
|
65
|
if (bindingResult.hasErrors()){
|
65
|
if (bindingResult.hasErrors()){
|
|
@@ -73,7 +73,7 @@ public class UserController { |
|
@@ -73,7 +73,7 @@ public class UserController { |
|
73
|
}
|
73
|
}
|
|
74
|
|
74
|
|
|
75
|
@LogAnnotation(moduleName = "用户管理",operate = "用户删除")
|
75
|
@LogAnnotation(moduleName = "用户管理",operate = "用户删除")
|
|
76
|
- @DeleteMapping("/user/del")
|
76
|
+ @DeleteMapping("/del")
|
|
77
|
public ResultJson delUser(@RequestBody USERS user,HttpServletRequest request,HttpServletResponse response){
|
77
|
public ResultJson delUser(@RequestBody USERS user,HttpServletRequest request,HttpServletResponse response){
|
|
78
|
//String username = getusername();
|
78
|
//String username = getusername();
|
|
79
|
int i = userService.deleteByPrimaryKey(user.getUserId());
|
79
|
int i = userService.deleteByPrimaryKey(user.getUserId());
|
|
@@ -82,7 +82,7 @@ public class UserController { |
|
@@ -82,7 +82,7 @@ public class UserController { |
|
82
|
|
82
|
|
|
83
|
}
|
83
|
}
|
|
84
|
|
84
|
|
|
85
|
- @PutMapping("/user/roleset")
|
85
|
+ @PutMapping("/roleset")
|
|
86
|
public ResultJson roleSet(@RequestBody UserRole userRole){
|
86
|
public ResultJson roleSet(@RequestBody UserRole userRole){
|
|
87
|
|
87
|
|
|
88
|
int i = userService.setUserRole(userRole);
|
88
|
int i = userService.setUserRole(userRole);
|
