From 923510deed8c991823db60dbd430bf18d78b98cb Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 07 Apr 2021 17:27:24 +0800
Subject: [PATCH] 登陆用户信息返回修改，用户组查询修改
---
screen-api/src/main/java/com/moral/api/controller/UserController.java | 62 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 30 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 6044b15..8f582ab 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;
@@ -11,6 +12,7 @@
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -19,10 +21,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.User;
import com.moral.api.service.UserService;
+import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.PageResult;
-import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"������"})
@@ -35,16 +37,10 @@
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
- @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"),
- @ApiImplicitParam(name = "wechat", value = "������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "addUser", method = RequestMethod.POST)
- public ResultMessage addUser(User user, HttpServletRequest request) {
+ public ResultMessage addUser(@RequestBody User user, HttpServletRequest request) {
if (user.getAccount().isEmpty() || user.getPassword().isEmpty()) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -54,42 +50,45 @@
if (!result.isEmpty()) {
return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
+
+ //������
+ String content = "������������������" + user.getAccount();
+ OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@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());
+ public ResultMessage deleteUser(@RequestBody User user, HttpServletRequest request) {
+ 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);
+
+ //������
+ String content = "������������������" + user.getAccount();
+ OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams({
- @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"),
- @ApiImplicitParam(name = "wechat", value = "������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "updateUser", method = RequestMethod.POST)
- public ResultMessage updateUser(User user, HttpServletRequest request) {
- if (user.getAccount().isEmpty() || user.getPassword().isEmpty()) {
+ public ResultMessage updateUser(@RequestBody User user, HttpServletRequest request) {
+ if (user.getId() == null) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
@@ -98,25 +97,28 @@
if (!result.isEmpty()) {
return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
+
+ //������
+ String content = "������������������" + user.getAccount();
+ OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@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 = "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);
+ public ResultMessage selectUsers(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
parameters.put("token", request.getHeader("token"));
Page<User> userPage = userService.selectUsers(parameters);
PageResult<User> pageResult = new PageResult<>(
--
Gitblit v1.8.0