From 25aeb531c8064ca768bb2d6f179ec7411b824b43 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 25 Mar 2021 17:33:27 +0800
Subject: [PATCH] 增加验证码配置常量，特殊字段名映射
---
screen-api/src/main/java/com/moral/api/controller/GroupController.java | 40 ++++++++++++++--------------------------
1 files changed, 14 insertions(+), 26 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 e4d3734..d1aa64d 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,13 +6,12 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
+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;
@@ -41,11 +40,10 @@
@ApiOperation(value = "���������", notes = "���������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "groupName", value = "������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "addGroup", method = RequestMethod.POST)
- private ResultMessage addGroup(Group group, HttpServletRequest request) {
+ private ResultMessage addGroup(@RequestBody Group group, HttpServletRequest request) {
if (group.getGroupName().isEmpty()) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -60,16 +58,16 @@
@ApiOperation(value = "���������", notes = "���������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "groupId", value = "���id", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "deleteGroup", method = RequestMethod.POST)
- public ResultMessage deleteGroup(String groupId) {
- if (groupId == null) {
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ public ResultMessage deleteGroup(@RequestBody Map<String, Object> parameters) {
+ if (!parameters.containsKey("groupId")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", groupId);
+ queryWrapper.eq("id", parameters.get("groupId"));
Group group = groupService.getOne(queryWrapper);
if (group == null) {
return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(), ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
@@ -80,11 +78,10 @@
@ApiOperation(value = "���������������", notes = "���������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "groupName", value = "������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "updateGroup", method = RequestMethod.POST)
- public ResultMessage updateUser(Group group, HttpServletRequest request) {
+ public ResultMessage updateUser(@RequestBody Group group, HttpServletRequest request) {
String token = request.getHeader("token");
Map<String, Object> result = groupService.updateGroup(group, token);
if (!result.isEmpty()) {
@@ -95,15 +92,14 @@
@ApiOperation(value = "���������������������", notes = "���������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @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 = "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(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage selectGroups(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
parameters.put("token", request.getHeader("token"));
Page<Group> userPage = groupService.selectGroups(parameters);
PageResult<Group> pageResult = new PageResult<>(
@@ -114,23 +110,15 @@
@ApiOperation(value = "���������������", notes = "���������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "groupIds", value = "���id,������������������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "allotGroups", method = RequestMethod.POST)
- public ResultMessage allotGroups(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage allotGroups(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
if (!parameters.containsKey("userId")) {
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
String token = request.getHeader("token");
- String[] groupIds = parameters.get("groupIds").toString().split(",");
- List<Integer> gIds = new ArrayList<>();
- for (String groupId : groupIds) {
- gIds.add(Integer.parseInt(groupId));
- }
- parameters.put("groupIds", gIds);
userGroupService.allotGroups(parameters, token);
return ResultMessage.ok();
}
--
Gitblit v1.8.0