From 72a6d5a954312a8a53e5bdd18c5f8f8b57b54dbc Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 08 Nov 2023 14:40:58 +0800
Subject: [PATCH] chore:分享权限修改提交
---
screen-api/src/main/java/com/moral/api/controller/UserController.java | 61 +++++++++++-------------------
1 files changed, 23 insertions(+), 38 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 8f582ab..1d1560a 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
@@ -21,13 +21,13 @@
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 = {"������"})
+@Api(tags = {"������������"})
@RestController
@RequestMapping("/user")
public class UserController {
@@ -39,46 +39,31 @@
@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());
}
-
- //������
- String content = "������������������" + user.getAccount();
- OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "������id", required = true, paramType = "query", dataType = "int"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "deleteUser", method = RequestMethod.POST)
- public ResultMessage deleteUser(@RequestBody User user, HttpServletRequest request) {
- if (user.getId() == null) {
+ @RequestMapping(value = "delete", method = RequestMethod.GET)
+ public ResultMessage delete(Integer id) {
+ if (id == null) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- QueryWrapper<User> queryWrapper = new 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());
- }
- userService.deleteUser(user);
-
- //������
- String content = "������������������" + user.getAccount();
- OperationLogUtils.insertLog(request, content);
+ userService.deleteUser(id);
return ResultMessage.ok();
}
@@ -86,29 +71,25 @@
@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());
}
-
- //������
- String content = "������������������" + user.getAccount();
- OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@ApiOperation(value = "������������������������", notes = "������������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"),
- @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "int"),
@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 = "query", dataType = "String"),
@@ -117,9 +98,13 @@
@ApiImplicitParam(name = "wechat", value = "������������������", required = false, paramType = "query", dataType = "String"),
})
- @RequestMapping(value = "selectUsers", method = RequestMethod.POST)
- public ResultMessage selectUsers(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
- parameters.put("token", request.getHeader("token"));
+ @RequestMapping(value = "select", method = RequestMethod.GET)
+ public ResultMessage select(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ if (!parameters.containsKey("page") || !parameters.containsKey("size")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
Page<User> userPage = userService.selectUsers(parameters);
PageResult<User> pageResult = new PageResult<>(
userPage.getTotal(), userPage.getPages(), userPage.getRecords()
--
Gitblit v1.8.0