Merge remote-tracking branch 'origin/master'

chenjiantian

2021-12-31 ba1482bb35c4f44deb069eb086acd7ec3b536548

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

@@ -24,7 +24,7 @@
    @GetMapping
    public ResponseVO<Object> listMonitor() {
        List<Monitor> list = monitorService.listMonitor();
        return ResponseUtil.successPage(list);
        return ResponseUtil.success(list);
    }

    /**
@@ -35,7 +35,7 @@
    @GetMapping("/listMonitorByKeyword")
    public ResponseVO<Object> listMonitorByKeyword(@RequestBody MonitorParam monitorParam) {
        List<Monitor> list = monitorService.listMonitorByKeyword(monitorParam);
        return ResponseUtil.successPage(list);
        return ResponseUtil.success(list);
    }


@@ -173,11 +173,12 @@
    }

    /**
     * 编辑摄像头设备信息
     * 获取摄像头URL播放地址
     */
    @GetMapping("/getMonitorVideoUrl")
    public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
        String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getProtocol());
        String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(),
                monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());

        return ResponseUtil.success(URL);
    }