From e3943cb07e5a4e42472eb501edc7d55f46d172f4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 11 一月 2021 17:37:38 +0800
Subject: [PATCH] Merge pull request #31 from BradyXuBin/master
---
.gitignore | 4 ++--
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0c96aaf..54054a0 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 e11c141..73d4dfa 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, count);
+ PageHelper.startPage(page+1, 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, count);
+ PageHelper.startPage(page+1, 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, count);
+ PageHelper.startPage(page+1, count);
List<Device> all = deviceMapper.getDevices();
return new PageInfo<>(all);
}
--
Gitblit v1.8.0