|
@@ -1,5 +1,7 @@
|
|
|
package space.anyi.openAPI.controller;
|
|
package space.anyi.openAPI.controller;
|
|
|
|
|
|
|
|
|
|
+import io.swagger.annotations.ApiImplicitParam;
|
|
|
|
|
+import io.swagger.annotations.ApiImplicitParams;
|
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
@@ -10,6 +12,8 @@ import space.anyi.openAPI.model.PageVO;
|
|
|
import space.anyi.openAPI.model.ResponseResult;
|
|
import space.anyi.openAPI.model.ResponseResult;
|
|
|
import space.anyi.openAPI.model.user.LoginUserDetails;
|
|
import space.anyi.openAPI.model.user.LoginUserDetails;
|
|
|
import space.anyi.openAPI.model.user.User;
|
|
import space.anyi.openAPI.model.user.User;
|
|
|
|
|
+import space.anyi.openAPI.model.user.dto.RequestLoginUser;
|
|
|
|
|
+import space.anyi.openAPI.model.user.dto.RequestRegisterUser;
|
|
|
import space.anyi.openAPI.model.user.dto.UserDTO;
|
|
import space.anyi.openAPI.model.user.dto.UserDTO;
|
|
|
import space.anyi.openAPI.model.user.vo.UserVO;
|
|
import space.anyi.openAPI.model.user.vo.UserVO;
|
|
|
import space.anyi.openAPI.service.UserService;
|
|
import space.anyi.openAPI.service.UserService;
|
|
@@ -37,12 +41,14 @@ public class UserController {
|
|
|
private PasswordEncoder passwordEncoder;
|
|
private PasswordEncoder passwordEncoder;
|
|
|
|
|
|
|
|
@PostMapping("/login")
|
|
@PostMapping("/login")
|
|
|
- public ResponseResult login(@RequestBody User user){
|
|
|
|
|
|
|
+ public ResponseResult login(@RequestBody RequestLoginUser requestLoginUser){
|
|
|
|
|
+ User user = BeanCopyUtil.copyBean(requestLoginUser, User.class);
|
|
|
return userService.login(user);
|
|
return userService.login(user);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/register")
|
|
@PostMapping("/register")
|
|
|
- public ResponseResult resister(@RequestBody User user){
|
|
|
|
|
|
|
+ public ResponseResult resister(@RequestBody RequestRegisterUser requestRegisterUser){
|
|
|
|
|
+ User user = BeanCopyUtil.copyBean(requestRegisterUser, User.class);
|
|
|
return userService.register(user);
|
|
return userService.register(user);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -58,10 +64,17 @@ public class UserController {
|
|
|
System.out.println("user = " + user);
|
|
System.out.println("user = " + user);
|
|
|
return ResponseResult.okResult(user);
|
|
return ResponseResult.okResult(user);
|
|
|
}
|
|
}
|
|
|
|
|
+ @ApiImplicitParams({
|
|
|
|
|
+ @ApiImplicitParam(name = "currentPage",value = "页码",required = true,defaultValue = "1"),
|
|
|
|
|
+ @ApiImplicitParam(name = "pageSize",value = "页面大小",required = true,defaultValue = "10"),
|
|
|
|
|
+ @ApiImplicitParam(name = "userName",value = "用户名称",required = false),
|
|
|
|
|
+ @ApiImplicitParam(name = "userAccount",value = "用户账号",required = false),
|
|
|
|
|
+ @ApiImplicitParam(name = "userRole",value = "用户角色",required = false)
|
|
|
|
|
+ })
|
|
|
@PreAuthorize("@ps.hasRole('管理员')")
|
|
@PreAuthorize("@ps.hasRole('管理员')")
|
|
|
@GetMapping("/page")
|
|
@GetMapping("/page")
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
- public ResponseResult page(Integer currentPage,Integer pageSize,String userName,String userAccount,String userRole){
|
|
|
|
|
|
|
+ public ResponseResult page(Integer currentPage, Integer pageSize, String userName, String userAccount, String userRole){
|
|
|
log.info("currentPage:{},pageSize:{},userName:{},userAccount:{}",currentPage,pageSize,userName,userAccount);
|
|
log.info("currentPage:{},pageSize:{},userName:{},userAccount:{}",currentPage,pageSize,userName,userAccount);
|
|
|
PageVO page = userService.pageByUsernameAndUseraccount(currentPage, pageSize, userName, userAccount,userRole);
|
|
PageVO page = userService.pageByUsernameAndUseraccount(currentPage, pageSize, userName, userAccount,userRole);
|
|
|
return ResponseResult.okResult(page);
|
|
return ResponseResult.okResult(page);
|