fix

zhanzhiqin

2022-01-06 e525cffa5ae93048d0ac1208d100e08bc69a4a3a

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

@@ -5,7 +5,9 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.dto.DeviceStatus;
import com.sandu.ximon.admin.param.PoleBindingParam;
@@ -60,9 +62,10 @@
    }

    @GetMapping("listPoleAndState")
    public ResponseVO<Object> listPoleAndState() {

        return ResponseUtil.success(poleService.queryStatesAndList());
    public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Pole> poles = poleService.queryStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        return ResponseUtil.successPage(poles);
    }