From d94135c9cd8b12fc511055af4398ad3a584a44d6 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期一, 11 一月 2021 17:46:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 4 +++-
.gitignore | 4 ++--
web_src/src/components/channelList.vue | 2 +-
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 6 +++---
4 files changed, 9 insertions(+), 7 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/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
index 0b4ecbb..c564edd 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 @@
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 546a3e4..ee7ccec 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 @@
@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);
}
@@ -131,7 +131,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);
}
@@ -151,7 +151,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);
}
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 4f663fa..9772324 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -108,7 +108,7 @@
mounted() {
this.initData();
if (this.autoList) {
- this.updateLooper = setInterval(this.initData, 1500);
+ this.updateLooper = setInterval(this.initData, 5000);
}
},
--
Gitblit v1.8.0