bug修复

liuhaonan

2022-03-14 6605887243ea39bb9941834e2d93aaa58b765f18

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

@@ -1,12 +1,17 @@
package com.sandu.ximon.admin.controller;

import com.github.pagehelper.PageHelper;
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.PoleGroupRelationParam;
import com.sandu.ximon.admin.service.PoleGroupService;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * 分组列表功能
@@ -20,7 +25,7 @@

    private final PoleGroupService poleGroupService;

    @GetMapping("/add")
    @PostMapping("/add")
    public ResponseVO<Object> addGroup(@RequestBody @Validated PoleGroupParam param) {
        return ResponseUtil.success(poleGroupService.addGroup(param));
    }
@@ -30,13 +35,20 @@
        return ResponseUtil.success(poleGroupService.updateGroup(groupId, param));
    }

    @GetMapping("/delete/{groupId}")
    @PostMapping("/delete/{groupId}")
    public ResponseVO<Object> delGroup(@PathVariable Long groupId) {
        return ResponseUtil.success(poleGroupService.deleteGroup(groupId));
    }

    @PostMapping("/list")
    public ResponseVO<Object> listGroup() {
        return ResponseUtil.success(poleGroupService.groupList());
    @GetMapping("/list")
    public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
                                        @RequestParam(value = "groupid", required = false) Long groupid) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        return ResponseUtil.success(poleGroupService.groupList(baseConditionVO,keyword,groupid));
    }

    @PostMapping("/bind/{groupId}")
    public ResponseVO<Object> bindPole(@PathVariable Long groupId,@RequestBody PoleGroupRelationParam param) {
        return ResponseUtil.success(poleGroupService.bindPole(groupId,param.getPoleIdList()));
    }
}