From 928cccb960dc1c0e354e3569ecd8e964f6d24deb Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 12 Apr 2021 17:41:25 +0800
Subject: [PATCH] 用户修改具体日志
---
screen-api/src/main/java/com/moral/api/controller/GroupController.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/GroupController.java b/screen-api/src/main/java/com/moral/api/controller/GroupController.java
index fa8b0df..1e758d0 100644
--- a/screen-api/src/main/java/com/moral/api/controller/GroupController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/GroupController.java
@@ -22,6 +22,7 @@
import com.moral.api.entity.Group;
import com.moral.api.service.GroupService;
import com.moral.api.service.UserGroupService;
+import com.moral.api.service.UserService;
import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -39,6 +40,9 @@
@Autowired
private UserGroupService userGroupService;
+ @Autowired
+ private UserService userService;
+
@ApiOperation(value = "���������", notes = "���������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
@@ -54,10 +58,6 @@
if (!result.isEmpty()) {
return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
-
- //������
- String content = "���������������" + group.getGroupName();
- OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@@ -78,10 +78,6 @@
return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(), ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
}
groupService.deleteGroup(group);
-
- //������
- String content = "���������������" + group.getGroupName();
- OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@@ -96,10 +92,6 @@
if (!result.isEmpty()) {
return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
-
- //������
- String content = "���������������" + group.getGroupName();
- OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@@ -122,12 +114,12 @@
return ResultMessage.ok(pageResult);
}
- @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiOperation(value = "���������������������ids", notes = "���������������������ids")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "get-group-ids", method = RequestMethod.GET)
- public ResultMessage getGroupIds(Integer userId){
+ public ResultMessage getGroupIds(Integer userId) {
List<Integer> groupIds = userGroupService.getGroupIds(userId);
return ResultMessage.ok(groupIds);
}
@@ -144,6 +136,10 @@
}
String token = request.getHeader("token");
userGroupService.allotGroups(parameters, token);
+
+ String account = userService.getById((Integer) parameters.get("userId")).getAccount();
+ String content = "������������" + account + "���������������";
+ OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
}
--
Gitblit v1.8.0