From 5d5e5a164fbaa4ee386b8e54f3d13779656808c1 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 16 十一月 2021 18:15:33 +0800
Subject: [PATCH] 修复目录订阅的定时刷新以及信令
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 27 ++++++++++-----------------
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java | 1 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 2 +-
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/ByeResponseProcessor.java | 1 -
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java | 3 ---
src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java | 5 +++--
6 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java b/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
index 145c29b..10dfc08 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
@@ -26,9 +26,10 @@
return new ThreadPoolTaskScheduler();
}
- public String startCron(String key, Runnable task, String corn) {
+ public String startCron(String key, Runnable task, int cycleForCatalog) {
stopCron(key);
- ScheduledFuture future = threadPoolTaskScheduler.schedule(task, new CronTrigger(corn));
+ // scheduleWithFixedDelay 蹇呴』绛夊緟涓婁竴涓换鍔＄粨鏉熸墠寮�濮嬭鏃秔eriod锛� cycleForCatalog琛ㄧず鎵ц鐨勯棿闅�
+ ScheduledFuture future = threadPoolTaskScheduler.scheduleWithFixedDelay(task, cycleForCatalog * 1000L);
futureMap.put(key, future);
return "startCron";
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
index 48eebf8..cac1a01 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
@@ -143,18 +143,15 @@
@Override
public void processIOException(IOExceptionEvent exceptionEvent) {
-// System.out.println("processIOException");
}
@Override
public void processTransactionTerminated(TransactionTerminatedEvent transactionTerminatedEvent) {
-// System.out.println("processTransactionTerminated");
}
@Override
public void processDialogTerminated(DialogTerminatedEvent dialogTerminatedEvent) {
CallIdHeader callId = dialogTerminatedEvent.getDialog().getCallId();
- System.out.println("processDialogTerminated:::::" + callId);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
index bb62902..4eac134 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
@@ -204,6 +204,7 @@
// Event
EventHeader eventHeader = sipFactory.createHeaderFactory().createEventHeader(event);
+ eventHeader.setEventType("Catalog");
request.addHeader(eventHeader);
ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "MANSCDP+xml");
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 7a0e901..1af2cdf 100644
--- 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
@@ -1486,7 +1486,7 @@
StringBuffer cmdXml = new StringBuffer(200);
cmdXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");
cmdXml.append("<Query>\r\n");
- cmdXml.append("<CmdType>CataLog</CmdType>\r\n");
+ cmdXml.append("<CmdType>Catalog</CmdType>\r\n");
cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
cmdXml.append("</Query>\r\n");
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/ByeResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/ByeResponseProcessor.java
index d44c1a9..64933b8 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/ByeResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/ByeResponseProcessor.java
@@ -42,7 +42,6 @@
@Override
public void process(ResponseEvent evt) {
// TODO Auto-generated method stub
- System.out.println("鏀跺埌bye");
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
index 7cee096..c1500d2 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -10,6 +10,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+/**
+ * 璁惧涓氬姟锛堢洰褰曡闃咃級
+ */
@Service
public class DeviceServiceImpl implements IDeviceService {
@@ -31,9 +34,10 @@
CatalogSubscribeTask catalogSubscribeTask = new CatalogSubscribeTask(device, sipCommander);
catalogSubscribeTask.run();
// 鎻愬墠寮�濮嬪埛鏂拌闃�
- // TODO 鏆傛椂鍏抽棴鐩綍璁㈤槄鐨勫畾鏃跺埛鏂帮紝鐩村埌姝ゅ姛鑳藉畬鍠�
-// String cron = getCron(device.getSubscribeCycleForCatalog() - 60);
-// dynamicTask.startCron(device.getDeviceId(), catalogSubscribeTask, cron);
+ int subscribeCycleForCatalog = device.getSubscribeCycleForCatalog();
+ // 璁剧疆鏈�灏忓�间负30
+ subscribeCycleForCatalog = Math.max(subscribeCycleForCatalog, 30);
+ dynamicTask.startCron(device.getDeviceId(), catalogSubscribeTask, subscribeCycleForCatalog - 5);
return true;
}
@@ -42,21 +46,10 @@
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
return false;
}
+ logger.info("绉婚櫎鐩綍璁㈤槄銆恵}銆�", device.getDeviceId());
dynamicTask.stopCron(device.getDeviceId());
+ device.setSubscribeCycleForCatalog(0);
+ sipCommander.catalogSubscribe(device, null, null);
return true;
- }
-
- public String getCron(int time) {
- if (time <= 59) {
- return "0/" + time +" * * * * ?";
- }else if (time <= 60* 59) {
- int minute = time/(60);
- return "0 0/" + minute +" * * * ?";
- }else if (time <= 60* 60* 59) {
- int hour = time/(60*60);
- return "0 0 0/" + hour +" * * ?";
- }else {
- return "0 0/10 * * * ?";
- }
}
}
--
Gitblit v1.8.0