diff --git a/.gitignore b/.gitignore index 0c96aafd..54054a0f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ # Mobile Tools for Java (J2ME) .mtj.tmp/ - +src/main/resources/application-*.yml # Package Files # #*.jar *.war @@ -18,7 +18,7 @@ *.zip *.tar.gz *.rar - +*.iml # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* /.idea/* diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java index e11c1416..73d4dfa3 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java @@ -107,7 +107,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { @Override 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 all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online); return new PageInfo<>(all); } @@ -119,7 +119,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { @Override public PageInfo 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 all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, parentChannelId, null, null, null); return new PageInfo<>(all); } @@ -139,7 +139,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { */ @Override public PageInfo queryVideoDeviceList(int page, int count) { - PageHelper.startPage(page, count); + PageHelper.startPage(page+1, count); List all = deviceMapper.getDevices(); return new PageInfo<>(all); }