From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/controller/GroupController.java | 87 +++++++++++++++++++++----------------------
1 files changed, 42 insertions(+), 45 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..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
@@ -6,18 +6,18 @@
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.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;
@@ -28,7 +28,7 @@
import com.moral.util.WebUtils;
@Slf4j
-@Api(tags = {"���"})
+@Api(tags = {"���������"})
@RestController
@RequestMapping("/group")
public class GroupController {
@@ -41,17 +41,15 @@
@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) {
+ @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,33 +58,26 @@
@ApiOperation(value = "���������", notes = "���������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "groupId", value = "���id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "id", value = "���id", required = true, paramType = "query", dataType = "int"),
@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());
+ @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", groupId);
- Group 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();
}
@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) {
- String token = request.getHeader("token");
- Map<String, Object> result = groupService.updateGroup(group, token);
+ @RequestMapping(value = "update", method = RequestMethod.POST)
+ 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());
}
@@ -95,16 +86,16 @@
@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 = "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(HttpServletRequest request) {
+ @RequestMapping(value = "select", method = RequestMethod.GET)
+ public ResultMessage select(HttpServletRequest request) {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- parameters.put("token", request.getHeader("token"));
Page<Group> userPage = groupService.selectGroups(parameters);
PageResult<Group> pageResult = new PageResult<>(
userPage.getTotal(), userPage.getPages(), userPage.getRecords()
@@ -112,26 +103,32 @@
return ResultMessage.ok(pageResult);
}
- @ApiOperation(value = "���������������", notes = "���������������")
+ @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 = "userId", value = "������id", required = true, paramType = "query", dataType = "int"),
@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);
+ @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 = "���������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @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());
+ 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);
+ userGroupService.allotGroups(parameters);
return ResultMessage.ok();
}
}
--
Gitblit v1.8.0