Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-01-12 8da27238ae8ed8a6963d13d9a4aede301ac22d32

 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;
@@ -47,8 +49,9 @@
    }

    @GetMapping("/list")
    public ResponseVO<Object> listPole(@RequestParam String keyword) {
        LambdaQueryWrapper<Pole> wrapper = Wrappers.lambdaQuery(Pole.class);
    public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<Pole> wrapper = Wrappers.lambdaQuery(Pole.class).orderByDesc(Pole::getId);
        if (StrUtil.isNotBlank(keyword)) {
            wrapper.like(Pole::getPoleCode, keyword)
                    .or(lampPostLambdaQueryWrapper -> {
@@ -56,22 +59,24 @@
                    });
        }
        List<Pole> list = poleService.list(wrapper);
        return ResponseUtil.success(list);
        return ResponseUtil.successPage(list);
    }

    @GetMapping("listPoleAndState")
    public ResponseVO<Object> listPoleAndState() {
    public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());

        return ResponseUtil.success(poleService.queryStatesAndList());
        List<Pole> poles = poleService.queryStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        return ResponseUtil.successPage(poles);
    }


    /**
     * 设置三元码
     */
    @PostMapping("/setMac/{poleId}")
    public ResponseVO<Object> setMac(@PathVariable Long poleId) {
        return ResponseUtil.success(poleService.setMac(poleId));
    @PostMapping("/setMac/{baseMac}")
    public ResponseVO<Object> setMac(@PathVariable String baseMac) {
        return ResponseUtil.success(poleService.setMac(baseMac));
    }

    /**
@@ -98,6 +103,12 @@

    @PostMapping("/listStatusByDeviceCode")
    public ResponseVO<Object> getStatusById(@RequestBody String[] deviceCodeList){
        for (String s: deviceCodeList) {
            if(s==null){
                return ResponseUtil.fail("参数不能为空");
            }

        }
        if(ArrayUtil.isEmpty(deviceCodeList)) {
            return ResponseUtil.fail("参数不能为空");
        }