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/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java index 0b4ecbb4..c564eddb 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java @@ -121,7 +121,9 @@ public class SipLayer implements SipListener { logger.debug(evt.getRequest().toString()); // 由于jainsip是单线程程序,为提高性能并发处理 processThreadPool.execute(() -> { - processorFactory.createRequestProcessor(evt).process(); + if (processorFactory != null) { + processorFactory.createRequestProcessor(evt).process(); + } }); } 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 546a3e49..ee7ccec9 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 @@ -119,7 +119,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); } @@ -131,7 +131,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); } @@ -151,7 +151,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); } diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index 4f663fa2..97723244 100644 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -108,7 +108,7 @@ export default { mounted() { this.initData(); if (this.autoList) { - this.updateLooper = setInterval(this.initData, 1500); + this.updateLooper = setInterval(this.initData, 5000); } },