Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb_21

jinpengyong

2023-08-23 8c741905bff160816524a54df00a4acca684b770

 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();
    }
}