Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

pull/38/head
panlinlin 2021-01-11 17:46:16 +08:00
parent 872d336ded e3943cb07e
commit d94135c9cd
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -9,7 +9,7 @@
# Mobile Tools for Java (J2ME) # Mobile Tools for Java (J2ME)
.mtj.tmp/ .mtj.tmp/
src/main/resources/application-*.yml
# Package Files # # Package Files #
#*.jar #*.jar
*.war *.war
@ -18,7 +18,7 @@
*.zip *.zip
*.tar.gz *.tar.gz
*.rar *.rar
*.iml
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid* hs_err_pid*
/.idea/* /.idea/*

4
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
View File

@ -121,7 +121,9 @@ public class SipLayer implements SipListener {
logger.debug(evt.getRequest().toString()); logger.debug(evt.getRequest().toString());
// 由于jainsip是单线程程序，为提高性能并发处理 // 由于jainsip是单线程程序，为提高性能并发处理
processThreadPool.execute(() -> { processThreadPool.execute(() -> {
processorFactory.createRequestProcessor(evt).process(); if (processorFactory != null) {
processorFactory.createRequestProcessor(evt).process();
}
}); });
} }

6
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
View File

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

2
web_src/src/components/channelList.vue
View File

@ -108,7 +108,7 @@ export default {
mounted() { mounted() {
this.initData(); this.initData();
if (this.autoList) { if (this.autoList) {
this.updateLooper = setInterval(this.initData, 1500); this.updateLooper = setInterval(this.initData, 5000);
} }
}, },