From 255d2d45810bf16d2508a9bc17c488526eb363d2 Mon Sep 17 00:00:00 2001
From: BradyXuBin <brady_xu@outlook.com>
Date: 星期一, 11 一月 2021 17:33:43 +0800
Subject: [PATCH] 1.修复分页错误，pageHelper是从1开始,目前是在后端的+1解决。 2.增加忽略自己本身配置文件。
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 01ed247..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
@@ -83,6 +83,16 @@
}
}
+ @Override
+ public void startPlay(String deviceId, String channelId, String streamId) {
+ deviceChannelMapper.startPlay(deviceId, channelId, streamId);
+ }
+
+ @Override
+ public void stopPlay(String deviceId, String channelId) {
+ deviceChannelMapper.stopPlay(deviceId, channelId);
+ }
+
/**
* 鑾峰彇璁惧
*
@@ -97,12 +107,10 @@
@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);
}
-
-
@Override
public List<DeviceChannel> queryChannelsByDeviceId(String deviceId) {
@@ -111,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);
}
@@ -131,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