panlinlin
2021-01-11 8b4d8a76acf3a699744caeda8ca6f0268136727e
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
3个文件已修改
13 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web_src/src/components/channelList.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web_src/src/components/videoList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -119,7 +119,7 @@
    @Override
    public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count) {
        // 获取到所有正在播放的流
        PageHelper.startPage(page+1, count);
        PageHelper.startPage(page, count);
        List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online);
        return new PageInfo<>(all);
    }
@@ -131,7 +131,7 @@
    @Override
    public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, String online, int page, int count) {
        PageHelper.startPage(page+1, count);
        PageHelper.startPage(page, count);
        List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, parentChannelId, null, null, null);
        return new PageInfo<>(all);
    }
@@ -151,7 +151,7 @@
     */
    @Override
    public PageInfo<Device> queryVideoDeviceList(int page, int count) {
        PageHelper.startPage(page+1, count);
        PageHelper.startPage(page, count);
        List<Device> all = deviceMapper.getDevices();
        return new PageInfo<>(all);
    }
web_src/src/components/channelList.vue
@@ -153,11 +153,10 @@
        },
        getDeviceChannelList: function () {
            let that = this;
            console.log(this.currentPage - 1)
            this.$axios.get(`/api/devices/${this.$route.params.deviceId}/channels`, {
                    params: {
                        page: that.currentPage - 1,
                        page: that.currentPage,
                        count: that.count,
                        query: that.searchSrt,
                        online: that.online,
@@ -254,7 +253,7 @@
            this.$axios.get(`/api/subChannels/${this.deviceId}/${this.parentChannelId}/channels`, {
                    params: {
                        page: that.currentPage - 1,
                        page: that.currentPage,
                        count: that.count,
                        query: that.searchSrt,
                        online: that.online,
web_src/src/components/videoList.vue
@@ -134,7 +134,7 @@
                this.getDeviceListLoading = true;
                this.$axios.get(`/api/devices`,{
                    params: {
                        page: that.currentPage - 1,
                        page: that.currentPage,
                        count: that.count
                    }
                } )