Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-13 1bcef6a688ffbee58c347bbd87e1b5db08075041

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

@@ -90,6 +90,17 @@
    }

    /**
     * 获取萤石云摄像头信息
     *
     * @param
     * @return
     */
    @GetMapping("/getYSYInfo/{deviceSerial}")
    public ResponseVO<Object> getMonitorInfo(@PathVariable String deviceSerial) {
        return ResponseUtil.success(monitorService.getMonitorInfo(deviceSerial));
    }

    /**
     * 添加萤石云摄像头
     *
     * @param monitorParam 添加摄像头结果