From 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Apr 2021 17:33:07 +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 |   34 +++++++++-------------------------
 1 files changed, 9 insertions(+), 25 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..938b016 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,7 +22,6 @@
 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;
@@ -44,20 +43,15 @@
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
     })
     @RequestMapping(value = "insert", method = RequestMethod.POST)
-    private ResultMessage insert(@RequestBody Group group, HttpServletRequest request) {
+    private ResultMessage insert(@RequestBody Group group) {
         if (group.getGroupName().isEmpty()) {
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                     ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }
-        String token = request.getHeader("token");
-        Map<String, Object> result = groupService.addGroup(group, token);
+        Map<String, Object> result = groupService.addGroup(group);
         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();
     }
 
@@ -66,7 +60,7 @@
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
     })
     @RequestMapping(value = "delete", method = RequestMethod.POST)
-    public ResultMessage delete(@RequestBody Group group, HttpServletRequest request) {
+    public ResultMessage delete(@RequestBody Group group) {
         if (group.getId() == null) {
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                     ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -78,10 +72,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();
     }
 
@@ -92,14 +82,10 @@
     @RequestMapping(value = "update", method = RequestMethod.POST)
     public ResultMessage update(@RequestBody Group group, HttpServletRequest request) {
         String token = request.getHeader("token");
-        Map<String, Object> result = groupService.updateGroup(group, token);
+        Map<String, Object> result = groupService.updateGroup(group);
         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();
     }
 
@@ -113,8 +99,7 @@
             @ApiImplicitParam(name = "groupName", value = "������������������", required = false, paramType = "query", dataType = "String")
     })
     @RequestMapping(value = "select", method = RequestMethod.POST)
-    public ResultMessage select(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
-        parameters.put("token", request.getHeader("token"));
+    public ResultMessage select(@RequestBody Map<String, Object> parameters) {
         Page<Group> userPage = groupService.selectGroups(parameters);
         PageResult<Group> pageResult = new PageResult<>(
                 userPage.getTotal(), userPage.getPages(), userPage.getRecords()
@@ -122,12 +107,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);
     }
@@ -137,13 +122,12 @@
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
     })
     @RequestMapping(value = "allot", method = RequestMethod.POST)
-    public ResultMessage allot(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
+    public ResultMessage allot(@RequestBody Map<String, Object> parameters) {
         if (!parameters.containsKey("userId")) {
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                     ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }
-        String token = request.getHeader("token");
-        userGroupService.allotGroups(parameters, token);
+        userGroupService.allotGroups(parameters);
         return ResultMessage.ok();
     }
 }

--
Gitblit v1.8.0