From 255d2d45810bf16d2508a9bc17c488526eb363d2 Mon Sep 17 00:00:00 2001 From: BradyXuBin Date: Mon, 11 Jan 2021 17:33:43 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8CpageHelper=E6=98=AF=E4=BB=8E1=E5=BC=80?= =?UTF-8?q?=E5=A7=8B,=E7=9B=AE=E5=89=8D=E6=98=AF=E5=9C=A8=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E7=9A=84+1=E8=A7=A3=E5=86=B3=E3=80=82=202.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BF=BD=E7=95=A5=E8=87=AA=E5=B7=B1=E6=9C=AC=E8=BA=AB?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 ++-- .../iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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); }