bug修复

liuhaonan

2022-06-23 6010d889a2a8d110bc8677b648e398367ecc7a7a

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java

@@ -30,31 +30,45 @@

    @PostMapping("/add")
    public ResponseVO<Object> addGroup(@RequestBody @Validated PoleGroupParam param) {
        if (!permissionConfig.check(MenuEnum.GROUP_ADD.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(poleGroupService.addGroup(param));
    }

    @PostMapping("/update/{groupId}")
    public ResponseVO<Object> updateGroup(@PathVariable Long groupId, @RequestBody @Validated PoleGroupParam param) {
        if (!permissionConfig.check(MenuEnum.GROUP_UPDATE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(poleGroupService.updateGroup(groupId, param));
    }

    @PostMapping("/delete/{groupId}")
    public ResponseVO<Object> delGroup(@PathVariable Long groupId) {
        if (!permissionConfig.check(MenuEnum.GROUP_DELETE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(poleGroupService.deleteGroup(groupId));
    }

    @GetMapping("/list")
    public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
                                        @RequestParam(value = "groupid", required = false) Long groupid) {
    public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO,
                                        @RequestParam(value = "keyword", required = false) String keyword,
                                        @RequestParam(value = "order", required = false) Integer order,
                                        @RequestParam(value = "seq", required = false) Integer seq) {
        if (!permissionConfig.check(MenuEnum.GROUP_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        return ResponseUtil.success(poleGroupService.groupList(baseConditionVO,keyword,groupid));
        return ResponseUtil.success(poleGroupService.groupList(baseConditionVO, keyword, order, seq));
    }

    @PostMapping("/bind/{groupId}")
    public ResponseVO<Object> bindPole(@PathVariable Long groupId,@RequestBody PoleGroupRelationParam param) {
        return ResponseUtil.success(poleGroupService.bindPole(groupId,param.getPoleIdList()));
    public ResponseVO<Object> bindPole(@PathVariable Long groupId, @RequestBody PoleGroupRelationParam param) {
        if (!permissionConfig.check(MenuEnum.GROUP_BINDING_POLE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(poleGroupService.bindPole(groupId, param.getPoleIdList()));
    }
}