Merge pull request #31 from BradyXuBin/master

修复分页错误和增加配置忽略文件

.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/*

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