From e5b1876012fc76f7ea273fa35e1262b067891bac Mon Sep 17 00:00:00 2001
From: gaofw189 <gaofw189@chinatelecom.cn>
Date: 星期四, 02 二月 2023 18:24:32 +0800
Subject: [PATCH] 修复WVP作为下级平台接收上级平台DeviceControl信令不做处理的问题。-修改日志备注
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java | 317 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 250 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java
index 9589bdf..46e8e92 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java
@@ -1,21 +1,23 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.control.cmd;
-import com.genersoft.iot.vmp.VManageBootstrap;
+import com.genersoft.iot.vmp.common.enums.DeviceControlType;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.control.ControlMessageHandler;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import com.genersoft.iot.vmp.utils.SpringBeanFactory;
-import gov.nist.javax.sip.SipStackImpl;
+import gov.nist.javax.sip.message.SIPRequest;
import org.dom4j.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
@@ -27,6 +29,7 @@
import javax.sip.message.Response;
import java.text.ParseException;
import java.util.Iterator;
+import java.util.Objects;
import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
@@ -48,6 +51,10 @@
@Autowired
private SIPCommanderFroPlatform cmderFroPlatform;
+ @Qualifier("taskExecutor")
+ @Autowired
+ private ThreadPoolTaskExecutor taskExecutor;
+
@Override
public void afterPropertiesSet() throws Exception {
controlMessageHandler.addHandler(cmdType, this);
@@ -61,85 +68,261 @@
@Override
public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element rootElement) {
+ SIPRequest request = (SIPRequest) evt.getRequest();
+
// 姝ゅ鏄笂绾у彂鍑虹殑DeviceControl鎸囦护
- String targetGBId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
+ String targetGBId = ((SipURI) request.getToHeader().getAddress().getURI()).getUser();
String channelId = getText(rootElement, "DeviceID");
// 杩滅▼鍚姩鍔熻兘
if (!ObjectUtils.isEmpty(getText(rootElement, "TeleBoot"))) {
if (parentPlatform.getServerGBId().equals(targetGBId)) {
// 杩滅▼鍚姩鏈钩鍙帮細闇�瑕佸湪閲嶆柊鍚姩绋嬪簭鍚庡厛瀵筍ipStack瑙ｇ粦
logger.info("鎵ц杩滅▼鍚姩鏈钩鍙板懡浠�");
- cmderFroPlatform.unregister(parentPlatform, null, null);
-
- Thread restartThread = new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- Thread.sleep(3000);
- SipProvider up = (SipProvider) SpringBeanFactory.getBean("udpSipProvider");
- SipStackImpl stack = (SipStackImpl)up.getSipStack();
- stack.stop();
- Iterator listener = stack.getListeningPoints();
- while (listener.hasNext()) {
- stack.deleteListeningPoint((ListeningPoint) listener.next());
- }
- Iterator providers = stack.getSipProviders();
- while (providers.hasNext()) {
- stack.deleteSipProvider((SipProvider) providers.next());
- }
- VManageBootstrap.restart();
- } catch (InterruptedException ignored) {
- } catch (ObjectInUseException e) {
- e.printStackTrace();
- }
- }
+ try {
+ cmderFroPlatform.unregister(parentPlatform, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
+ }
+ taskExecutor.execute(()->{
+ // 杩滅▼鍚姩
+// try {
+// Thread.sleep(3000);
+// SipProvider up = (SipProvider) SpringBeanFactory.getBean("udpSipProvider");
+// SipStackImpl stack = (SipStackImpl)up.getSipStack();
+// stack.stop();
+// Iterator listener = stack.getListeningPoints();
+// while (listener.hasNext()) {
+// stack.deleteListeningPoint((ListeningPoint) listener.next());
+// }
+// Iterator providers = stack.getSipProviders();
+// while (providers.hasNext()) {
+// stack.deleteSipProvider((SipProvider) providers.next());
+// }
+// VManageBootstrap.restart();
+// } catch (InterruptedException | ObjectInUseException e) {
+// logger.error("[浠诲姟鎵ц澶辫触] 鏈嶅姟閲嶅惎: {}", e.getMessage());
+// }
});
-
- restartThread.setDaemon(false);
- restartThread.start();
- } else {
- // 杩滅▼鍚姩鎸囧畾璁惧
}
}
- // 浜戝彴/鍓嶇鎺у埗鍛戒护
- if (!ObjectUtils.isEmpty(getText(rootElement,"PTZCmd")) && !parentPlatform.getServerGBId().equals(targetGBId)) {
- String cmdString = getText(rootElement,"PTZCmd");
+ DeviceControlType deviceControlType = DeviceControlType.typeOf(rootElement);
+ if (!ObjectUtils.isEmpty(deviceControlType) && !parentPlatform.getServerGBId().equals(targetGBId)){
+ //鍒ゆ柇鏄惁瀛樺湪璇ラ�氶亾
Device deviceForPlatform = storager.queryVideoDeviceByPlatformIdAndChannelId(parentPlatform.getServerGBId(), channelId);
if (deviceForPlatform == null) {
try {
- responseAck(evt, Response.NOT_FOUND);
- return;
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
+ responseAck(request, Response.NOT_FOUND);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 閿欒淇℃伅: {}", e.getMessage());
}
+ return;
}
- cmder.fronEndCmd(deviceForPlatform, channelId, cmdString, eventResult -> {
- // 澶辫触鐨勫洖澶�
- try {
- responseAck(evt, eventResult.statusCode, eventResult.msg);
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
- }
- }, eventResult -> {
- // 鎴愬姛鐨勫洖澶�
- try {
- responseAck(evt, eventResult.statusCode);
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
- }
- });
+ switch (deviceControlType){
+ case PTZ:
+ handlePtzCmd(deviceForPlatform,channelId,rootElement,request,DeviceControlType.PTZ);
+ break;
+ case ALARM:
+ handleAlarmCmd(deviceForPlatform,rootElement,request);
+ break;
+ case GUARD:
+ handleGuardCmd(deviceForPlatform,rootElement,request,DeviceControlType.GUARD);
+ break;
+ case RECORD:
+ handleRecordCmd(deviceForPlatform,channelId,rootElement,request,DeviceControlType.RECORD);
+ break;
+ case I_FRAME:
+ handleIFameCmd(deviceForPlatform,channelId);
+ break;
+ case TELE_BOOT:
+ handleTeleBootCmd(deviceForPlatform);
+ break;
+ case DRAG_ZOOM_IN:
+ handleDragZoom(deviceForPlatform,channelId,rootElement,DeviceControlType.DRAG_ZOOM_IN);
+ break;
+ case DRAG_ZOOM_OUT:
+ handleDragZoom(deviceForPlatform,channelId,rootElement,DeviceControlType.DRAG_ZOOM_OUT);
+ break;
+ case HOME_POSITION:
+ handleHomePositionCmd(deviceForPlatform,channelId,rootElement,request,DeviceControlType.HOME_POSITION);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ /**
+ * 澶勭悊浜戝彴鎸囦护
+ * @param device 璁惧
+ * @param channelId 閫氶亾id
+ * @param rootElement
+ * @param request
+ */
+ private void handlePtzCmd(Device device,String channelId,Element rootElement,SIPRequest request,DeviceControlType type){
+ String cmdString = getText(rootElement,type.getVal());
+ try {
+ cmder.fronEndCmd(device, channelId, cmdString,
+ errorResult -> onError(request,errorResult),
+ okResult -> onOk(request,okResult));
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 浜戝彴/鍓嶇: {}", e.getMessage());
+ }
+
+ }
+
+ /**
+ * 澶勭悊寮哄埗鍏抽敭甯�
+ * @param device 璁惧
+ * @param channelId 閫氶亾id
+ */
+ private void handleIFameCmd(Device device,String channelId){
+ try {
+ cmder.iFrameCmd(device,channelId);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 寮哄埗鍏抽敭甯�: {}", e.getMessage());
+ }
+ }
+
+ /**
+ * 澶勭悊閲嶅惎鍛戒护
+ * @param device 璁惧淇℃伅
+ */
+ private void handleTeleBootCmd(Device device){
+ try {
+ cmder.teleBootCmd(device);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 閲嶅惎: {}", e.getMessage());
+ }
+
+ }
+
+ /**
+ * 澶勭悊鎷夋鎺у埗
+ * @param device 璁惧淇℃伅
+ * @param channelId 閫氶亾id
+ * @param rootElement 鏍硅妭鐐�
+ * @param type 娑堟伅绫诲瀷
+ */
+ private void handleDragZoom(Device device,String channelId,Element rootElement,DeviceControlType type){
+ String cmdString = getText(rootElement,type.getVal());
+ StringBuffer cmdXml = new StringBuffer(200);
+ cmdXml.append("<" + type.getVal() + ">\r\n");
+ cmdXml.append(cmdString);
+ cmdXml.append("</" + type.getVal() + ">\r\n");
+ try {
+ cmder.dragZoomCmd(device,channelId,cmdXml.toString());
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鎷夋鎺у埗: {}", e.getMessage());
+ }
+
+ }
+
+ /**
+ * 澶勭悊鐪嬪畧浣嶅懡浠�
+ * @param device 璁惧淇℃伅
+ * @param channelId 閫氶亾id
+ * @param rootElement 鏍硅妭鐐�
+ * @param request 璇锋眰淇℃伅
+ * @param type 娑堟伅绫诲瀷
+ */
+ private void handleHomePositionCmd(Device device,String channelId,Element rootElement,SIPRequest request,DeviceControlType type){
+ //鑾峰彇鏁翠釜娑堟伅涓讳綋锛屾垜浠彧闇�瑕佷慨鏀硅姹傚ご鍗冲彲
+ String cmdString = getText(rootElement,type.getVal());
+ try {
+ cmder.homePositionCmd(device, channelId, cmdString,null,null,null,
+ errorResult -> onError(request,errorResult),
+ okResult -> onOk(request,okResult));
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鐪嬪畧浣嶈缃�: {}", e.getMessage());
+ }
+ }
+
+ /**
+ * 澶勭悊鍛婅娑堟伅
+ * @param device 璁惧淇℃伅
+ * @param rootElement 鏍硅妭鐐�
+ * @param request 璇锋眰淇℃伅
+ */
+ private void handleAlarmCmd(Device device,Element rootElement,SIPRequest request){
+ //鍛婅鏂规硶
+ String alarmMethod = "";
+ //鍛婅绫诲瀷
+ String alarmType = "";
+ Element info = rootElement.element("Info");
+ if (info !=null){
+ alarmMethod = getText(rootElement,"AlarmMethod");
+ alarmType = getText(rootElement,"AlarmType");
+ }
+ try {
+ cmder.alarmCmd(device, alarmMethod,alarmType,
+ errorResult -> onError(request,errorResult));
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍛婅娑堟伅: {}", e.getMessage());
+ }
+ }
+
+ /**
+ * 澶勭悊褰曞儚鎺у埗
+ * @param device 璁惧淇℃伅
+ * @param channelId 閫氶亾id
+ * @param rootElement 鏍硅妭鐐�
+ * @param request 璇锋眰淇℃伅
+ * @param type 娑堟伅绫诲瀷
+ */
+ private void handleRecordCmd(Device device,String channelId,Element rootElement,SIPRequest request,DeviceControlType type){
+ //鑾峰彇鏁翠釜娑堟伅涓讳綋锛屾垜浠彧闇�瑕佷慨鏀硅姹傚ご鍗冲彲
+ String cmdString = getText(rootElement,type.getVal());
+ try {
+ cmder.recordCmd(device, channelId,cmdString,
+ errorResult -> onError(request,errorResult));
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 褰曞儚鎺у埗: {}", e.getMessage());
+ }
+ }
+
+ /**
+ * 澶勭悊鎶ヨ甯冮槻/鎾ら槻鍛戒护
+ * @param device 璁惧淇℃伅
+ * @param rootElement 鏍硅妭鐐�
+ * @param request 璇锋眰淇℃伅
+ * @param type 娑堟伅绫诲瀷
+ */
+ private void handleGuardCmd(Device device,Element rootElement,SIPRequest request,DeviceControlType type){
+ //鑾峰彇鏁翠釜娑堟伅涓讳綋锛屾垜浠彧闇�瑕佷慨鏀硅姹傚ご鍗冲彲
+ String cmdString = getText(rootElement,type.getVal());
+ try {
+ cmder.guardCmd(device, cmdString,
+ errorResult -> onError(request,errorResult));
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 甯冮槻/鎾ら槻鍛戒护: {}", e.getMessage());
+ }
+ }
+
+
+ /**
+ * 閿欒鍝嶅簲澶勭悊
+ * @param request 璇锋眰
+ * @param eventResult 鍝嶅簲缁撴瀯
+ */
+ private void onError(SIPRequest request, SipSubscribe.EventResult eventResult){
+ // 澶辫触鐨勫洖澶�
+ try {
+ responseAck(request, eventResult.statusCode, eventResult.msg);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥炲: {}", e.getMessage());
+ }
+ }
+ /**
+ * 鎴愬姛鍝嶅簲澶勭悊
+ * @param request 璇锋眰
+ * @param eventResult 鍝嶅簲缁撴瀯
+ */
+ private void onOk(SIPRequest request, SipSubscribe.EventResult eventResult){
+ // 鎴愬姛鐨勫洖澶�
+ try {
+ responseAck(request, eventResult.statusCode);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥炲: {}", e.getMessage());
}
}
}
--
Gitblit v1.8.0