Skip to content

yangxiujun / paidan_demo

Go to a project
Commit f1c4d1b7 by huangjinxin
Options

fix:调整用户增删改相关接口

1 parent 9684a4ed
Inline Side-by-side
Showing with 51 additions and 42 deletions
project-interface/src/main/java/com/dituhui/pea/user/IUser.java
...@@ -14,37 +14,38 @@ import com.dituhui.pea.enums.ThirdPartyEnum; ...@@ -14,37 +14,38 @@ import com.dituhui.pea.enums.ThirdPartyEnum;
/** /**
* 用户相关接口 * 用户相关接口
*
* @author * @author
*/ */
@FeignClient(value = "project-user", contextId = "user") @FeignClient(value = "project-user", contextId = "user")
public interface IUser { public interface IUser {
/** /**
* 登录接口 * 登录接口
* *
* @param user * @param user
* @return * @return
*/ */
@RequestMapping(value = "/pea-user/login", method = RequestMethod.POST) @RequestMapping(value = "/pea-user/login", method = RequestMethod.POST)
public Result<UserLoginDTO> userLogin(@RequestBody UserLoginParam user); public Result<UserLoginDTO> userLogin(@RequestBody UserLoginParam user);
/** /**
* 获取用户信息 * 获取用户信息
* *
* @param userId * @param userId
* @return * @return
*/ */
@RequestMapping(value = "/pea-user/userInfo", method = RequestMethod.GET) @RequestMapping(value = "/pea-user/userInfo", method = RequestMethod.GET)
public Result<UserLoginDTO> getUserInfo(@RequestHeader(name="userId", required = true) String userId); public Result<UserLoginDTO> getUserInfo(@RequestHeader(name = "userId", required = true) String userId);
/** /**
* 刷新appkey接口<br> * 刷新appkey接口<br>
* 初始化系统ak缓存，例如系统上线，新ak入库的时候 * 初始化系统ak缓存，例如系统上线，新ak入库的时候
* *
* @return * @return
*/ */
@RequestMapping(value = "/pea-user/refreshAppkey", method = RequestMethod.POST) @RequestMapping(value = "/pea-user/refreshAppkey", method = RequestMethod.POST)
public Result<Boolean> refreshAppkey(); public Result<Boolean> refreshAppkey();
/** /**
* 获取当前登陆用户信息 * 获取当前登陆用户信息
...@@ -59,6 +60,7 @@ public interface IUser { ...@@ -59,6 +60,7 @@ public interface IUser {
/** /**
* 获取用户信息 * 获取用户信息
*
* @param id 用户ID * @param id 用户ID
* @return * @return
*/ */
...@@ -86,7 +88,7 @@ public interface IUser { ...@@ -86,7 +88,7 @@ public interface IUser {
/** /**
* 获取用户信息 * 获取用户信息
* *
* @param id 第三方标志 * @param id 第三方标志
* @param type 第三方类型 * @param type 第三方类型
* @return * @return
*/ */
...@@ -96,31 +98,35 @@ public interface IUser { ...@@ -96,31 +98,35 @@ public interface IUser {
/** /**
* 添加用户 * 添加用户
*
* @param userInfo 用户信息 * @param userInfo 用户信息
* @return * @return
*/ */
@RequestMapping(value = "/pea-user/add", method = RequestMethod.POST) @RequestMapping(value = "/pea-user/add", method = RequestMethod.POST)
WebResult<UserInfo> addUser(@RequestBody UserInfo userInfo); Result<UserInfo> addUser(@RequestBody UserInfo userInfo);
/** /**
* 更新用户 * 更新用户
*
* @param userInfo 用户信息 * @param userInfo 用户信息
* @return * @return
*/ */
@RequestMapping(value = "/pea-user/update", method = RequestMethod.POST) @RequestMapping(value = "/pea-user/update", method = RequestMethod.POST)
WebResult<UserInfo> updateUser(@RequestBody UserInfo userInfo); Result<UserInfo> updateUser(@RequestBody UserInfo userInfo);
/** /**
* 删除用户 * 删除用户
*
* @param userId 用户ID * @param userId 用户ID
* @return * @return
*/ */
@RequestMapping(value = "/pea-user/delete", method = RequestMethod.POST) @RequestMapping(value = "/pea-user/delete", method = RequestMethod.POST)
WebResult<Boolean> deleteUser(@RequestParam("id") String userId); Result<Boolean> deleteUser(@RequestParam("id") String userId);
/** /**
* 注册用户 * 注册用户
*
* @param userInfo 用户信息 * @param userInfo 用户信息
* @return * @return
*/ */
...@@ -129,6 +135,7 @@ public interface IUser { ...@@ -129,6 +135,7 @@ public interface IUser {
/** /**
* 第三方用户注册 * 第三方用户注册
*
* @param thirdUserInfo 第三方用户信息 * @param thirdUserInfo 第三方用户信息
* @return * @return
*/ */
...@@ -138,6 +145,7 @@ public interface IUser { ...@@ -138,6 +145,7 @@ public interface IUser {
/** /**
* 用户列表 * 用户列表
*
* @param search 查询条件 * @param search 查询条件
* @return * @return
*/ */
...@@ -147,6 +155,7 @@ public interface IUser { ...@@ -147,6 +155,7 @@ public interface IUser {
/** /**
* 禁用用户 * 禁用用户
*
* @param search 查询条件 * @param search 查询条件
* @return * @return
*/ */
......
project-user/src/main/java/com/dituhui/pea/user/controller/UserController.java
...@@ -84,39 +84,39 @@ public class UserController implements IUser { ...@@ -84,39 +84,39 @@ public class UserController implements IUser {
} }
@Override @Override
public WebResult<UserInfo> addUser(UserInfo userInfo) { public Result<UserInfo> addUser(UserInfo userInfo) {
if (ObjectUtil.isNull(userInfo)) { if (ObjectUtil.isNull(userInfo)) {
return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY); return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
} }
if (StringUtils.isBlank(userInfo.getAccount())) { if (StringUtils.isBlank(userInfo.getAccount())) {
return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY); return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
} }
if (StringUtils.isBlank(userInfo.getPassword())) { if (StringUtils.isBlank(userInfo.getPassword())) {
return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY); return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
} }
userInfo = userService.saveUser(userInfo); userInfo = userService.saveUser(userInfo);
return WebResult.ok(userInfo); return Result.success(userInfo);
} }
@Override @Override
public WebResult<UserInfo> updateUser(UserInfo userInfo) { public Result<UserInfo> updateUser(UserInfo userInfo) {
if (userInfo == null) { if (userInfo == null) {
return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY); return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
} }
if (StringUtils.isBlank(userInfo.getId())) { if (StringUtils.isBlank(userInfo.getId())) {
return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY); return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
} }
userInfo = userService.updateUser(userInfo); userInfo = userService.updateUser(userInfo);
return WebResult.ok(userInfo); return Result.success(userInfo);
} }
@Override @Override
public WebResult<Boolean> deleteUser(String userId) { public Result<Boolean> deleteUser(String userId) {
if (StringUtils.isBlank(userId)) { if (StringUtils.isBlank(userId)) {
return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY); return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
} }
userService.deleteUser(userId); userService.deleteUser(userId);
return WebResult.ok(); return Result.success(true);
} }
@Override @Override
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!