changes

liuhaonan

2022-10-25 dda268997ca8f8a364f7c19b45d7a43a50a98efe

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

@@ -4,7 +4,7 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.PoleGroupParam;
import com.sandu.ximon.admin.param.GroupParam;
import com.sandu.ximon.admin.param.PoleGroupRelationParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.PoleGroupService;
@@ -12,8 +12,6 @@
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * 分组列表功能
@@ -29,7 +27,7 @@
    private PermissionConfig permissionConfig;

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

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

    @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}")