Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

pull/38/head
panlinlin 2021-01-11 17:51:44 +08:00
parent d94135c9cd 021b820736
commit 8b4d8a76ac
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
View File

@ -119,7 +119,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
@Override @Override
public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count) { 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); List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online);
return new PageInfo<>(all); return new PageInfo<>(all);
} }
@ -131,7 +131,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
@Override @Override
public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, String online, int page, int count) { 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); List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, parentChannelId, null, null, null);
return new PageInfo<>(all); return new PageInfo<>(all);
} }
@ -151,7 +151,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
*/ */
@Override @Override
public PageInfo<Device> queryVideoDeviceList(int page, int count) { public PageInfo<Device> queryVideoDeviceList(int page, int count) {
PageHelper.startPage(page+1, count); PageHelper.startPage(page, count);
List<Device> all = deviceMapper.getDevices(); List<Device> all = deviceMapper.getDevices();
return new PageInfo<>(all); return new PageInfo<>(all);
} }

5
web_src/src/components/channelList.vue
View File

@ -153,11 +153,10 @@ export default {
}, },
getDeviceChannelList: function () { getDeviceChannelList: function () {
let that = this; let that = this;
console.log(this.currentPage - 1)
this.$axios.get(`/api/devices/${this.$route.params.deviceId}/channels`, { this.$axios.get(`/api/devices/${this.$route.params.deviceId}/channels`, {
params: { params: {
page: that.currentPage - 1, page: that.currentPage,
count: that.count, count: that.count,
query: that.searchSrt, query: that.searchSrt,
online: that.online, online: that.online,
@ -254,7 +253,7 @@ export default {
this.$axios.get(`/api/subChannels/${this.deviceId}/${this.parentChannelId}/channels`, { this.$axios.get(`/api/subChannels/${this.deviceId}/${this.parentChannelId}/channels`, {
params: { params: {
page: that.currentPage - 1, page: that.currentPage,
count: that.count, count: that.count,
query: that.searchSrt, query: that.searchSrt,
online: that.online, online: that.online,

2
web_src/src/components/videoList.vue
View File

@ -134,7 +134,7 @@
this.getDeviceListLoading = true; this.getDeviceListLoading = true;
this.$axios.get(`/api/devices`,{ this.$axios.get(`/api/devices`,{
params: { params: {
page: that.currentPage - 1, page: that.currentPage,
count: that.count count: that.count
} }
} ) } )