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 | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 34e7464..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
@@ -16,10 +16,12 @@
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
@@ -92,27 +94,35 @@
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
String token = request.getHeader("token");
- Map<String, Object> result = userService.addUser(user, token);
+ 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