Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-01-12 8da27238ae8ed8a6963d13d9a4aede301ac22d32

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

@@ -49,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 -> {
@@ -58,12 +59,13 @@
                    });
        }
        List<Pole> list = poleService.list(wrapper);
        return ResponseUtil.success(list);
        return ResponseUtil.successPage(list);
    }

    @GetMapping("listPoleAndState")
    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);
    }
@@ -72,9 +74,9 @@
    /**
     * 设置三元码
     */
    @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));
    }

    /**
@@ -101,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("参数不能为空");
        }