From 2cf7178cb79dc59edede0caeea81b5d262618cca Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 11 六月 2024 10:14:14 +0800
Subject: [PATCH] Merge branch 'refs/heads/2.7.1'
---
/dev/null | 33 ---------------------------------
web_src/src/components/dialog/deviceEdit.vue | 3 +++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 2 ++
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java | 14 ++++++++++----
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 3 +++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java | 4 +++-
6 files changed, 21 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
index 6557bba..a15de22 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
@@ -4,7 +4,6 @@
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
-import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeHandlerTask;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -58,12 +57,19 @@
dynamicTask.stop(taskOverdueKey);
}
- public void putMobilePositionSubscribe(String platformId, SubscribeInfo subscribeInfo) {
+ public void putMobilePositionSubscribe(String platformId, SubscribeInfo subscribeInfo, Runnable gpsTask) {
mobilePositionMap.put(platformId, subscribeInfo);
String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetting.getServerId() + "MobilePosition_" + platformId;
// 娣诲姞浠诲姟澶勭悊GPS瀹氭椂鎺ㄩ��
- dynamicTask.startCron(key, new MobilePositionSubscribeHandlerTask(platformId),
- subscribeInfo.getGpsInterval() * 1000);
+
+ int cycleForCatalog;
+ if (subscribeInfo.getGpsInterval() <= 0) {
+ cycleForCatalog = 5;
+ }else {
+ cycleForCatalog = subscribeInfo.getGpsInterval();
+ }
+ dynamicTask.startCron(key, gpsTask,
+ cycleForCatalog * 1000);
String taskOverdueKey = taskOverduePrefix + "MobilePosition_" + platformId;
if (subscribeInfo.getExpires() > 0) {
// 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/MobilePositionSubscribeHandlerTask.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/MobilePositionSubscribeHandlerTask.java
deleted file mode 100755
index a4512f3..0000000
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/MobilePositionSubscribeHandlerTask.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.genersoft.iot.vmp.gb28181.task.impl;
-
-import com.genersoft.iot.vmp.common.CommonCallback;
-import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
-import com.genersoft.iot.vmp.service.IPlatformService;
-import com.genersoft.iot.vmp.utils.SpringBeanFactory;
-
-/**
- * 鍚戝凡缁忚闃�(绉诲姩浣嶇疆)鐨勪笂绾у彂閫丮obilePosition娑堟伅
- * @author lin
- */
-public class MobilePositionSubscribeHandlerTask implements ISubscribeTask {
-
-
- private IPlatformService platformService;
- private String platformId;
-
-
- public MobilePositionSubscribeHandlerTask(String platformId) {
- this.platformService = SpringBeanFactory.getBean("platformServiceImpl");
- this.platformId = platformId;
- }
-
- @Override
- public void run() {
- platformService.sendNotifyMobilePosition(this.platformId);
- }
-
- @Override
- public void stop(CommonCallback<Boolean> callback) {
-
- }
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index 247dd8e..e27343c 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -1230,6 +1230,8 @@
subscribePostitionXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
if (device.getSubscribeCycleForMobilePosition() > 0) {
subscribePostitionXml.append("<Interval>" + device.getMobilePositionSubmissionInterval() + "</Interval>\r\n");
+ }else {
+ subscribePostitionXml.append("<Interval>5</Interval>\r\n");
}
subscribePostitionXml.append("</Query>\r\n");
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
index 1580baf..c392a12 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
@@ -147,7 +147,9 @@
subscribeHolder.removeMobilePositionSubscribe(platformId);
}else {
subscribeInfo.setResponse(response);
- subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
+ subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo, ()->{
+ platformService.sendNotifyMobilePosition(platformId);
+ });
}
} catch (SipException | InvalidArgumentException | ParseException e) {
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
index 9dd4c3d..8a2618b 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
@@ -322,6 +322,9 @@
public void updateDevice(Device device){
if (device != null && device.getDeviceId() != null) {
+ if (device.getSubscribeCycleForMobilePosition() > 0 && device.getMobilePositionSubmissionInterval() <= 0) {
+ device.setMobilePositionSubmissionInterval(5);
+ }
deviceService.updateCustomDevice(device);
}
}
diff --git a/web_src/src/components/dialog/deviceEdit.vue b/web_src/src/components/dialog/deviceEdit.vue
index d8e0b43..d8092fa 100755
--- a/web_src/src/components/dialog/deviceEdit.vue
+++ b/web_src/src/components/dialog/deviceEdit.vue
@@ -128,6 +128,9 @@
this.form.subscribeCycleForCatalog = this.form.subscribeCycleForCatalog||0
this.form.subscribeCycleForMobilePosition = this.form.subscribeCycleForMobilePosition||0
this.form.mobilePositionSubmissionInterval = this.form.mobilePositionSubmissionInterval||0
+ if (this.form.mobilePositionSubmissionInterval === 0) {
+ this.form.mobilePositionSubmissionInterval = 5
+ }
this.$axios({
method: 'post',
url:`/api/device/query/device/${this.isEdit?'update':'add'}/`,
--
Gitblit v1.8.0