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/GroupController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 d1aa64d..9e9faab 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
@@ -21,10 +21,10 @@
import com.moral.api.entity.Group;
import com.moral.api.service.GroupService;
import com.moral.api.service.UserGroupService;
+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 = {"���"})
@@ -53,6 +53,10 @@
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();
}
@@ -61,18 +65,22 @@
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "deleteGroup", method = RequestMethod.POST)
- public ResultMessage deleteGroup(@RequestBody Map<String, Object> parameters) {
- if (!parameters.containsKey("groupId")) {
+ public ResultMessage deleteGroup(@RequestBody Group group, HttpServletRequest request) {
+ if (group.getId() == null) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", parameters.get("groupId"));
- Group group = groupService.getOne(queryWrapper);
+ queryWrapper.eq("id", group.getId());
+ group = groupService.getOne(queryWrapper);
if (group == null) {
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();
}
@@ -87,6 +95,10 @@
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();
}
--
Gitblit v1.8.0