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 pull request #31 from BradyXuBin/master 

修复分页错误和增加配置忽略文件
pull/32/head
648540858 2021-01-11 17:37:38 +08:00 committed by GitHub
parent 74c9e0400d 255d2d4581
commit e3943cb07e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -9,7 +9,7 @@
# Mobile Tools for Java (J2ME) # Mobile Tools for Java (J2ME)
.mtj.tmp/ .mtj.tmp/
src/main/resources/application-*.yml
# Package Files # # Package Files #
#*.jar #*.jar
*.war *.war
@ -18,7 +18,7 @@
*.zip *.zip
*.tar.gz *.tar.gz
*.rar *.rar
*.iml
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid* hs_err_pid*
/.idea/* /.idea/*

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

@ -107,7 +107,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, count); PageHelper.startPage(page+1, 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);
} }
@ -119,7 +119,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, count); PageHelper.startPage(page+1, 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);
} }
@ -139,7 +139,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, count); PageHelper.startPage(page+1, count);
List<Device> all = deviceMapper.getDevices(); List<Device> all = deviceMapper.getDevices();
return new PageInfo<>(all); return new PageInfo<>(all);
} }