修改环比数据接口数据格式

lizijie

2022-03-15 009c553b99fa6a6b7aeaa6a6115ab1c6a90669d2

 screen-api/src/main/java/com/moral/api/controller/GroupController.java

@@ -12,23 +12,23 @@
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;
import com.moral.api.service.UserGroupService;
import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.PageResult;
import com.moral.util.WebUtils;

@Slf4j
@Api(tags = {"组"})
@Api(tags = {"组管理"})
@RestController
@RequestMapping("/group")
public class GroupController {
@@ -44,44 +44,30 @@
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @RequestMapping(value = "insert", method = RequestMethod.POST)
    private ResultMessage insert(@RequestBody Group group, HttpServletRequest request) {
    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());
        }

        //日志
        String content = "添加了组：" + group.getGroupName();
        OperationLogUtils.insertLog(request, content);
        return ResultMessage.ok();
    }

    @ApiOperation(value = "删除组", notes = "删除组")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "组id", required = true, paramType = "query", dataType = "int"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @RequestMapping(value = "delete", method = RequestMethod.POST)
    public ResultMessage delete(@RequestBody Group group, HttpServletRequest request) {
        if (group.getId() == null) {
    @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", group.getId());
        group = groupService.getOne(queryWrapper);
        if (group == null) {
            return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(), ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
        }
        groupService.deleteGroup(group);

        //日志
        String content = "删除了组：" + group.getGroupName();
        OperationLogUtils.insertLog(request, content);
        groupService.deleteGroup(id);
        return ResultMessage.ok();
    }

@@ -90,16 +76,11 @@
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @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);
    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());
        }

        //日志
        String content = "修改了组：" + group.getGroupName();
        OperationLogUtils.insertLog(request, content);
        return ResultMessage.ok();
    }

@@ -112,9 +93,9 @@
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
            @ApiImplicitParam(name = "groupName", value = "组名模糊查询", required = false, paramType = "query", dataType = "String")
    })
    @RequestMapping(value = "select", method = RequestMethod.POST)
    public ResultMessage select(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
        parameters.put("token", request.getHeader("token"));
    @RequestMapping(value = "select", method = RequestMethod.GET)
    public ResultMessage select(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        Page<Group> userPage = groupService.selectGroups(parameters);
        PageResult<Group> pageResult = new PageResult<>(
                userPage.getTotal(), userPage.getPages(), userPage.getRecords()
@@ -122,14 +103,19 @@
        return ResultMessage.ok(pageResult);
    }

    @ApiOperation(value = "获取用户所属组", notes = "获取用户所属组")
    @ApiOperation(value = "获取用户组（角色）", notes = "获取用户组（角色）")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "query", dataType = "int"),
            @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);
    @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 = "用户分配组")
@@ -137,13 +123,12 @@
            @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, HttpServletRequest request) {
    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();
    }
}