Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-07-19 db6dd3f7550c433f06475540a13598cbeed12d08

 src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java

@@ -114,17 +114,8 @@
                                   @RequestParam(required = false)String q,
                                   @RequestParam(required = false)Boolean online ){

//        if (logger.isDebugEnabled()) {
//            logger.debug("查询所有视频设备API调用");
//        }

        JSONObject result = new JSONObject();
        // 查询设备是否存在
//        Device device = storager.queryVideoDevice(serial);
//        if (device == null) {
//            result.put("ChannelCount", 0);
//            result.put("ChannelList", "[]");
//            return result;
//        }
        List<DeviceChannelExtend> deviceChannels;
        List<String> channelIds = null;
        if (!ObjectUtils.isEmpty(code)) {