From 91a88471d84246524548a318aec1f22735cfedc9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 13 Jul 2021 15:48:46 +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 | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 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..302b910 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
@@ -17,7 +17,6 @@
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 +24,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 +57,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 +75,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 +92,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()
@@ -109,12 +104,18 @@
@ApiOperation(value = "���������������������ids", notes = "���������������������ids")
@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)
+ @RequestMapping(value = "getGroupIds", method = RequestMethod.GET)
public ResultMessage getGroupIds(Integer userId) {
- List<Integer> groupIds = userGroupService.getGroupIds(userId);
- return ResultMessage.ok(groupIds);
+ System.out.println(userId);
+ if (userId == null) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ List<Map<String, Object>> groups = groupService.getGroupIds(userId);
+ return ResultMessage.ok(groups);
}
@ApiOperation(value = "���������������", notes = "���������������")
--
Gitblit v1.8.0