From cd8755a6ac55137176666a6f4fbfd15210389d77 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 19 Mar 2021 17:33:26 +0800
Subject: [PATCH] 登陆验证码，组分配，菜单分配
---
screen-api/src/main/java/com/moral/api/controller/UserController.java | 77 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/UserController.java b/screen-api/src/main/java/com/moral/api/controller/UserController.java
index 12b071a..6044b15 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UserController.java
@@ -15,10 +15,13 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.User;
import com.moral.api.service.UserService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
+import com.moral.util.PageResult;
import com.moral.util.WebUtils;
@Slf4j
@@ -32,8 +35,8 @@
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "account", value = "������,������6-10", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "password", value = "������,������6-20", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "account", value = "������,������6-10", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "password", value = "������,������6-20", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "userName", value = "������������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "email", value = "������,������123456@qq.com", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "mobile", value = "���������,1������11���������", required = false, paramType = "query", dataType = "String"),
@@ -42,16 +45,14 @@
})
@RequestMapping(value = "addUser", method = RequestMethod.POST)
public ResultMessage addUser(User user, HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ if (user.getAccount().isEmpty() || user.getPassword().isEmpty()) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
String token = request.getHeader("token");
- Map<String, Object> map = userService.addUser(user, token);
-
-
- if (map.containsKey("msg")) {
- return ResultMessage.fail(map.get("msg").toString());
+ Map<String, Object> result = userService.addUser(user, token);
+ if (!result.isEmpty()) {
+ return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
return ResultMessage.ok();
}
@@ -62,22 +63,24 @@
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "deleteUser", method = RequestMethod.POST)
- public ResultMessage deleteUser(String userId, HttpServletRequest request) {
+ public ResultMessage deleteUser(String userId) {
if (userId == null) {
- return ResultMessage.fail("������������������");
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- String token = request.getHeader("token");
- Map<String, Object> map = userService.deleteUser(Integer.parseInt(userId), token);
- if (map.containsKey("msg")) {
- return ResultMessage.fail(map.get("msg").toString());
+ QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("id", userId);
+ User user = userService.getOne(queryWrapper);
+ if (user == null) {
+ return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(), ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
}
+ userService.deleteUser(user);
return ResultMessage.ok();
}
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "account", value = "������,������6-10", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "password", value = "������,������6-20", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "account", value = "������,������6-10", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "password", value = "������,������6-20", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "userName", value = "������������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "email", value = "������,������123456@qq.com", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "mobile", value = "���������,1������11���������", required = false, paramType = "query", dataType = "String"),
@@ -86,28 +89,40 @@
})
@RequestMapping(value = "updateUser", method = RequestMethod.POST)
public ResultMessage updateUser(User user, HttpServletRequest request) {
+ if (user.getAccount().isEmpty() || user.getPassword().isEmpty()) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
String token = request.getHeader("token");
- Map<String, Object> map = userService.updateUser(user, token);
- if (map.containsKey("msg")) {
- return ResultMessage.fail(map.get("msg").toString());
+ Map<String, Object> result = userService.updateUser(user, token);
+ if (!result.isEmpty()) {
+ return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
return ResultMessage.ok();
}
- @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiOperation(value = "������������������������", notes = "������������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "������id", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "account", value = "������������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "userName", value = "���������������������", required = false, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "mobile", value = "���������������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "email", value = "������������������", required = false, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "wechat", value = "������������������", required = false, paramType = "header", dataType = "String"),
+
})
- @RequestMapping(value = "getUserInfo", method = RequestMethod.POST)
- public ResultMessage getUserInfo(HttpServletRequest request) {
+ @RequestMapping(value = "selectUsers", method = RequestMethod.POST)
+ public ResultMessage selectUsers(HttpServletRequest request) {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
parameters.put("token", request.getHeader("token"));
- Map<String, Object> users = userService.getUsers(parameters);
- if (users.containsKey("msg")) {
- return ResultMessage.fail(users.get("msg").toString());
- }
- return ResultMessage.ok(users.get("users"));
+ Page<User> userPage = userService.selectUsers(parameters);
+ PageResult<User> pageResult = new PageResult<>(
+ userPage.getTotal(), userPage.getPages(), userPage.getRecords()
+ );
+ return ResultMessage.ok(pageResult);
}
}
--
Gitblit v1.8.0