From d563527289927f2ac2f2f9ae25e0b59c5d532684 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期二, 12 一月 2021 13:03:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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 73d4dfa..e11c141 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 @@
@Override
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);
return new PageInfo<>(all);
}
@@ -119,7 +119,7 @@
@Override
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);
return new PageInfo<>(all);
}
@@ -139,7 +139,7 @@
*/
@Override
public PageInfo<Device> queryVideoDeviceList(int page, int count) {
- PageHelper.startPage(page+1, count);
+ PageHelper.startPage(page, count);
List<Device> all = deviceMapper.getDevices();
return new PageInfo<>(all);
}
--
Gitblit v1.8.0