Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-01-12 8da27238ae8ed8a6963d13d9a4aede301ac22d32

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

@@ -65,6 +65,7 @@
    @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);
    }
@@ -102,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("参数不能为空");
        }