|
@@ -12,9 +12,12 @@ import com.diagbot.entity.User;
|
|
|
import com.diagbot.facade.PermissionFacade;
|
|
|
import com.diagbot.facade.UserFacade;
|
|
|
import com.diagbot.vo.AppkeySecretVO;
|
|
|
+import com.diagbot.vo.BaseIdVO;
|
|
|
import com.diagbot.vo.ResetPasswordVO;
|
|
|
+import com.diagbot.vo.UserInfoByIdPageVO;
|
|
|
import com.diagbot.vo.UserLoginVO;
|
|
|
import com.diagbot.vo.UserSaveVO;
|
|
|
+import com.diagbot.vo.UsernameVO;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -133,9 +136,9 @@ public class UserController {
|
|
|
@SysLogger("getByUsername")
|
|
|
@ApiIgnore
|
|
|
// @PreAuthorize("hasAnyAuthority('ROLE_USER')")
|
|
|
- public RespDTO getUserInfo(@RequestParam String username) {
|
|
|
+ public RespDTO getUserInfo(@RequestBody UsernameVO usernameVO) {
|
|
|
//参数判读省略
|
|
|
- User user = userFacade.getUserInfo(username);
|
|
|
+ User user = userFacade.getUserInfo(usernameVO.getUsername());
|
|
|
return RespDTO.onSuc(user);
|
|
|
}
|
|
|
|
|
@@ -143,10 +146,10 @@ public class UserController {
|
|
|
@PostMapping("/getUserInfoByID")
|
|
|
@SysLogger("getUserInfoByID")
|
|
|
@ApiIgnore
|
|
|
- public RespDTO getUserInfoByID(Long id, Page page) {
|
|
|
+ public RespDTO getUserInfoByID(@RequestBody UserInfoByIdPageVO userInfoByIdPageVO) {
|
|
|
User userVo = new User();
|
|
|
- userVo.setId(id);
|
|
|
- IPage<User> user = userFacade.selectUserListPage(page, userVo);
|
|
|
+ userVo.setId(userInfoByIdPageVO.getId());
|
|
|
+ IPage<User> user = userFacade.selectUserListPage(userInfoByIdPageVO, userVo);
|
|
|
return RespDTO.onSuc(user);
|
|
|
}
|
|
|
|
|
@@ -206,7 +209,7 @@ public class UserController {
|
|
|
/**
|
|
|
* 查询用户信息
|
|
|
*
|
|
|
- * @param id 用户ID
|
|
|
+ * @param baseIdVO 用户ID
|
|
|
* @return 用户信息
|
|
|
*/
|
|
|
@ApiOperation(value = "查询用户(示例)[by:gaodm]", notes = "查询用户")
|
|
@@ -214,14 +217,14 @@ public class UserController {
|
|
|
@SysLogger("getUser")
|
|
|
@Transactional
|
|
|
@ApiIgnore
|
|
|
- public RespDTO getUser(Long id) {
|
|
|
- return RespDTO.onSuc(userFacade.getById(id));
|
|
|
+ public RespDTO getUser(@RequestBody BaseIdVO baseIdVO) {
|
|
|
+ return RespDTO.onSuc(userFacade.getById(baseIdVO.getId()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 删除用户
|
|
|
*
|
|
|
- * @param id 用户ID
|
|
|
+ * @param baseIdVO 用户ID
|
|
|
* @return 删除是否成功
|
|
|
*/
|
|
|
@ApiOperation(value = "删除用户(示例)[by:gaodm]", notes = "删除用户")
|
|
@@ -229,8 +232,8 @@ public class UserController {
|
|
|
@SysLogger("delUser")
|
|
|
@Transactional
|
|
|
@ApiIgnore
|
|
|
- public RespDTO delUser(Long id) {
|
|
|
- return RespDTO.onSuc(userFacade.removeById(id));
|
|
|
+ public RespDTO delUser(@RequestBody BaseIdVO baseIdVO) {
|
|
|
+ return RespDTO.onSuc(userFacade.removeById(baseIdVO.getId()));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "控制台账户信息[by:rengb]", notes = "控制台账户信息")
|