From 89c6943973621c6dfc23844999245cc35ee477b4 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 07 Apr 2021 17:05:51 +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 | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 ceffe70..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
@@ -21,6 +21,7 @@
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;
@@ -49,27 +50,35 @@
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 = "Integer")
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "deleteUser", method = RequestMethod.POST)
- public ResultMessage deleteUser(@RequestBody Map<String, Object> parameters) {
- if (!parameters.containsKey("uid")) {
+ 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", parameters.get("uid"));
- 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());
}
userService.deleteUser(user);
+
+ //������
+ String content = "������������������" + user.getAccount();
+ OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@@ -88,6 +97,10 @@
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();
}
--
Gitblit v1.8.0