guzijian / wvp-GB28181-pro · Commits

Commit e3943cb07e5a4e42472eb501edc7d55f46d172f4

Authored by 648540858
Committed by GitHub
2 parents 74c9e040 255d2d45

Merge pull request #31 from BradyXuBin/master 

修复分页错误和增加配置忽略文件
Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
.gitignore
  View file @e3943cb
... ... @@ -9,7 +9,7 @@
9 9  
10 10 # Mobile Tools for Java (J2ME)
11 11 .mtj.tmp/
12   -
  12 +src/main/resources/application-*.yml
13 13 # Package Files #
14 14 #*.jar
15 15 *.war
... ... @@ -18,7 +18,7 @@
18 18 *.zip
19 19 *.tar.gz
20 20 *.rar
21   -
  21 +*.iml
22 22 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
23 23 hs_err_pid*
24 24 /.idea/*
... ...
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
  View file @e3943cb
... ... @@ -107,7 +107,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
107 107 @Override
108 108 public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count) {
109 109 // 获取到所有正在播放的流
110   - PageHelper.startPage(page, count);
  110 + PageHelper.startPage(page+1, count);
111 111 List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online);
112 112 return new PageInfo<>(all);
113 113 }
... ... @@ -119,7 +119,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
119 119  
120 120 @Override
121 121 public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, String online, int page, int count) {
122   - PageHelper.startPage(page, count);
  122 + PageHelper.startPage(page+1, count);
123 123 List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, parentChannelId, null, null, null);
124 124 return new PageInfo<>(all);
125 125 }
... ... @@ -139,7 +139,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
139 139 */
140 140 @Override
141 141 public PageInfo<Device> queryVideoDeviceList(int page, int count) {
142   - PageHelper.startPage(page, count);
  142 + PageHelper.startPage(page+1, count);
143 143 List<Device> all = deviceMapper.getDevices();
144 144 return new PageInfo<>(all);
145 145 }
... ...