From 771d591cb1ef40344f6c84b5c30cfd8ffd8e2f14 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 23 Apr 2021 14:49:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/controller/UserController.java | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 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 41e3d80..a9dfc17 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
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+
import lombok.extern.slf4j.Slf4j;
import java.util.Map;
@@ -23,7 +24,6 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.PageResult;
-import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"������"})
@@ -38,14 +38,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "addUser", method = RequestMethod.POST)
- public ResultMessage addUser(@RequestBody User user, HttpServletRequest request) {
+ @RequestMapping(value = "insert", method = RequestMethod.POST)
+ public ResultMessage insert(@RequestBody User user) {
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> result = userService.addUser(user, token);
+ Map<String, Object> result = userService.addUser(user);
if (!result.isEmpty()) {
return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
@@ -54,18 +53,20 @@
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "query", dataType = "String")
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "deleteUser", method = RequestMethod.POST)
- public ResultMessage deleteUser(String userId) {
- if (userId == null) {
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ @RequestMapping(value = "delete", method = RequestMethod.POST)
+ public ResultMessage delete(@RequestBody User user) {
+ if (user.getId() == null) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", userId);
- User user = userService.getOne(queryWrapper);
+ queryWrapper.eq("id", user.getId());
+ user = userService.getOne(queryWrapper);
if (user == null) {
- return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(), ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
+ return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(),
+ ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
}
userService.deleteUser(user);
return ResultMessage.ok();
@@ -75,14 +76,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "updateUser", method = RequestMethod.POST)
- public ResultMessage updateUser(@RequestBody User user, HttpServletRequest request) {
+ @RequestMapping(value = "update", method = RequestMethod.POST)
+ public ResultMessage update(@RequestBody User user) {
if (user.getId() == null) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- String token = request.getHeader("token");
- Map<String, Object> result = userService.updateUser(user, token);
+ Map<String, Object> result = userService.updateUser(user);
if (!result.isEmpty()) {
return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
@@ -91,21 +91,20 @@
@ApiOperation(value = "������������������������", notes = "������������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "orderType", value = "������������������������0������������1", defaultValue = "0", 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 = "userName", value = "���������������������", required = false, paramType = "query", 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"),
+ @ApiImplicitParam(name = "email", value = "������������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "wechat", value = "������������������", required = false, paramType = "query", dataType = "String"),
})
- @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"));
+ @RequestMapping(value = "select", method = RequestMethod.POST)
+ public ResultMessage select(@RequestBody Map<String, Object> parameters) {
Page<User> userPage = userService.selectUsers(parameters);
PageResult<User> pageResult = new PageResult<>(
userPage.getTotal(), userPage.getPages(), userPage.getRecords()
--
Gitblit v1.8.0