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/GroupController.java |   43 ++++++++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 21 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 938b016..eb3efcc 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
@@ -12,12 +12,12 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.moral.api.entity.Group;
 import com.moral.api.service.GroupService;
@@ -25,9 +25,10 @@
 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("/group")
 public class GroupController {
@@ -57,21 +58,16 @@
 
     @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 = "delete", method = RequestMethod.POST)
-    public ResultMessage delete(@RequestBody Group group) {
-        if (group.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<Group> queryWrapper = new 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);
+        groupService.deleteGroup(id);
         return ResultMessage.ok();
     }
 
@@ -80,8 +76,7 @@
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
     })
     @RequestMapping(value = "update", method = RequestMethod.POST)
-    public ResultMessage update(@RequestBody Group group, HttpServletRequest request) {
-        String token = request.getHeader("token");
+    public ResultMessage update(@RequestBody Group group) {
         Map<String, Object> result = groupService.updateGroup(group);
         if (!result.isEmpty()) {
             return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
@@ -98,8 +93,9 @@
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
             @ApiImplicitParam(name = "groupName", value = "������������������", required = false, paramType = "query", dataType = "String")
     })
-    @RequestMapping(value = "select", method = RequestMethod.POST)
-    public ResultMessage select(@RequestBody Map<String, Object> parameters) {
+    @RequestMapping(value = "select", method = RequestMethod.GET)
+    public ResultMessage select(HttpServletRequest request) {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
         Page<Group> userPage = groupService.selectGroups(parameters);
         PageResult<Group> pageResult = new PageResult<>(
                 userPage.getTotal(), userPage.getPages(), userPage.getRecords()
@@ -107,14 +103,19 @@
         return ResultMessage.ok(pageResult);
     }
 
-    @ApiOperation(value = "���������������������ids", notes = "���������������������ids")
+    @ApiOperation(value = "���������������������������", notes = "���������������������������")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "query", dataType = "int"),
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
     })
-    @RequestMapping(value = "get-group-ids", method = RequestMethod.GET)
-    public ResultMessage getGroupIds(Integer userId) {
-        List<Integer> groupIds = userGroupService.getGroupIds(userId);
-        return ResultMessage.ok(groupIds);
+    @RequestMapping(value = "getGroup", method = RequestMethod.GET)
+    public ResultMessage getGroup(Integer userId) {
+        if (ObjectUtils.isEmpty(userId)) {
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        }
+        Map<String, Object> group = groupService.getGroup(userId);
+        return ResultMessage.ok(group);
     }
 
     @ApiOperation(value = "���������������", notes = "���������������")

--
Gitblit v1.8.0