From fe9e3a7e341f4979beb09d287a5ee761c660e728 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 10 May 2021 14:54:19 +0800
Subject: [PATCH] screen-manage 添加组织返回字段
---
screen-api/src/main/java/com/moral/api/controller/GroupController.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 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..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
@@ -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;
@@ -24,7 +25,6 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.PageResult;
-import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"���"})
@@ -42,14 +42,13 @@
@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) {
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());
}
@@ -60,15 +59,15 @@
@ApiImplicitParams({
@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")) {
+ @RequestMapping(value = "delete", method = RequestMethod.POST)
+ public ResultMessage delete(@RequestBody Group group) {
+ 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());
}
@@ -80,10 +79,10 @@
@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);
+ Map<String, Object> result = groupService.updateGroup(group);
if (!result.isEmpty()) {
return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
@@ -95,12 +94,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) {
- parameters.put("token", request.getHeader("token"));
+ @RequestMapping(value = "select", method = RequestMethod.POST)
+ 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()
@@ -108,18 +107,27 @@
return ResultMessage.ok(pageResult);
}
+ @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) {
+ 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) {
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