648540858
2022-02-27 e94b99d11c46246532edc93cd25cbf8c0b88f03f
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
@@ -73,7 +73,7 @@
            deviceJsonObject.put("ChannelCount", device.getChannelCount());
            deviceJsonObject.put("RecvStreamIP", "");
            deviceJsonObject.put("CatalogInterval", 3600); // 通道目录抓取周期
            deviceJsonObject.put("SubscribeInterval", 0); // 订阅周期(秒), 0 表示后台不周期订阅
            deviceJsonObject.put("SubscribeInterval", device.getSubscribeCycleForCatalog()); // 订阅周期(秒), 0 表示后台不周期订阅
            deviceJsonObject.put("Online", device.getOnline() == 1);
            deviceJsonObject.put("Password", "");
            deviceJsonObject.put("MediaTransport", device.getTransport());
@@ -110,13 +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 {
            PageInfo<DeviceChannel> pageResult = storager.queryChannelsByDeviceId(serial, null, null, null,start/limit, limit);
            result.put("ChannelCount", pageResult.getTotal());
            deviceChannels = pageResult.getList();
            deviceChannels = storager.queryChannelsByDeviceIdWithStartAndLimit(serial, null, null, null,start, limit);
            int total = allDeviceChannelList.size();
            result.put("ChannelCount", total);
        }
        JSONArray channleJSONList = new JSONArray();