支持国标级联的目录订阅功能

648540858

2022-01-14 ac1a4a027a7bd88efb32e9da666bdba4b5fa166f

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

@@ -110,14 +110,14 @@
            return result;
        }
        List<DeviceChannel> deviceChannels;
        List<DeviceChannel> allDeviceChannelList = storager.queryChannelsByDeviceId(serial);
        if (start == null || limit ==null) {
            deviceChannels = storager.queryChannelsByDeviceId(serial);
            deviceChannels = allDeviceChannelList;
            result.put("ChannelCount", deviceChannels.size());
        }else {
            start ++;
            PageInfo pageResult = storager.queryChannelsByDeviceId(serial, null, null, null,start, limit);
            result.put("ChannelCount", pageResult.getList().size());
            deviceChannels = pageResult.getList();
            deviceChannels = storager.queryChannelsByDeviceIdWithStartAndLimit(serial, null, null, null,start, limit);
            int total = allDeviceChannelList.size();
            result.put("ChannelCount", total);
        }

        JSONArray channleJSONList = new JSONArray();