From 51c36e6f6b17862714fbd5c42da43386dc05d28a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 09 Apr 2021 14:32:29 +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 | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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 9e9faab..fa8b0df 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
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -42,8 +43,8 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "addGroup", method = RequestMethod.POST)
- private ResultMessage addGroup(@RequestBody Group group, HttpServletRequest request) {
+ @RequestMapping(value = "insert", method = RequestMethod.POST)
+ private ResultMessage insert(@RequestBody Group group, HttpServletRequest request) {
if (group.getGroupName().isEmpty()) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -64,8 +65,8 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "deleteGroup", method = RequestMethod.POST)
- public ResultMessage deleteGroup(@RequestBody Group group, HttpServletRequest request) {
+ @RequestMapping(value = "delete", method = RequestMethod.POST)
+ public ResultMessage delete(@RequestBody Group group, HttpServletRequest request) {
if (group.getId() == null) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -88,8 +89,8 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "updateGroup", method = RequestMethod.POST)
- public ResultMessage updateUser(@RequestBody Group group, HttpServletRequest request) {
+ @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);
if (!result.isEmpty()) {
@@ -107,11 +108,12 @@
@ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "orderType", value = "������������������������0������������1", defaultValue = "0", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
@ApiImplicitParam(name = "groupName", value = "������������������", required = false, paramType = "query", dataType = "String")
})
- @RequestMapping(value = "selectGroups", method = RequestMethod.POST)
- public ResultMessage selectGroups(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
+ @RequestMapping(value = "select", method = RequestMethod.POST)
+ public ResultMessage select(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
parameters.put("token", request.getHeader("token"));
Page<Group> userPage = groupService.selectGroups(parameters);
PageResult<Group> pageResult = new PageResult<>(
@@ -120,12 +122,22 @@
return ResultMessage.ok(pageResult);
}
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @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){
+ List<Integer> groupIds = userGroupService.getGroupIds(userId);
+ return ResultMessage.ok(groupIds);
+ }
+
@ApiOperation(value = "���������������", notes = "���������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "allotGroups", method = RequestMethod.POST)
- public ResultMessage allotGroups(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
+ @RequestMapping(value = "allot", method = RequestMethod.POST)
+ public ResultMessage allot(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
if (!parameters.containsKey("userId")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
--
Gitblit v1.8.0