From 55ee6f5f0d363faacdb04e7ff01ef9f23e0b9d7f Mon Sep 17 00:00:00 2001
From: gaofw189 <gaofw189@chinatelecom.cn>
Date: 星期二, 07 二月 2023 09:26:08 +0800
Subject: [PATCH] 修复WVP作为下级平台接受devicecontrol命令处理-调试修改逻辑
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java | 188 ++++++++++++++++++++++++++--------------------
1 files changed, 105 insertions(+), 83 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 fa54a0f..4ac83de 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
@@ -2,6 +2,8 @@
import com.genersoft.iot.vmp.common.enums.DeviceControlType;
import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.DragZoomRequest;
+import com.genersoft.iot.vmp.gb28181.bean.HomePositionRequest;
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;
@@ -20,18 +22,14 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import javax.sip.*;
import javax.sip.address.SipURI;
-import javax.sip.header.HeaderAddress;
-import javax.sip.header.ToHeader;
import javax.sip.message.Response;
import java.text.ParseException;
-import java.util.Iterator;
-import java.util.Objects;
+import java.util.List;
-import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.*;
@Component
public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
@@ -83,7 +81,7 @@
} catch (InvalidArgumentException | ParseException | SipException e) {
logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
}
- taskExecutor.execute(()->{
+ taskExecutor.execute(() -> {
// 杩滅▼鍚姩
// try {
// Thread.sleep(3000);
@@ -106,7 +104,8 @@
}
}
DeviceControlType deviceControlType = DeviceControlType.typeOf(rootElement);
- if (!ObjectUtils.isEmpty(deviceControlType) && !parentPlatform.getServerGBId().equals(targetGBId)){
+ logger.info("[鎺ュ彈deviceControl鍛戒护] 鍛戒护: {}", deviceControlType);
+ if (!ObjectUtils.isEmpty(deviceControlType) && !parentPlatform.getServerGBId().equals(targetGBId)) {
//鍒ゆ柇鏄惁瀛樺湪璇ラ�氶亾
Device deviceForPlatform = storager.queryVideoDeviceByPlatformIdAndChannelId(parentPlatform.getServerGBId(), channelId);
if (deviceForPlatform == null) {
@@ -117,33 +116,33 @@
}
return;
}
- switch (deviceControlType){
+ switch (deviceControlType) {
case PTZ:
- handlePtzCmd(deviceForPlatform,channelId,rootElement,request,DeviceControlType.PTZ);
+ handlePtzCmd(deviceForPlatform, channelId, rootElement, request, DeviceControlType.PTZ);
break;
case ALARM:
- handleAlarmCmd(deviceForPlatform,rootElement,request);
+ handleAlarmCmd(deviceForPlatform, rootElement, request);
break;
case GUARD:
- handleGuardCmd(deviceForPlatform,rootElement,request,DeviceControlType.GUARD);
+ handleGuardCmd(deviceForPlatform, rootElement, request, DeviceControlType.GUARD);
break;
case RECORD:
- handleRecordCmd(deviceForPlatform,channelId,rootElement,request,DeviceControlType.RECORD);
+ handleRecordCmd(deviceForPlatform, channelId, rootElement, request, DeviceControlType.RECORD);
break;
case I_FRAME:
- handleIFameCmd(deviceForPlatform,request,channelId);
+ handleIFameCmd(deviceForPlatform, request, channelId);
break;
case TELE_BOOT:
- handleTeleBootCmd(deviceForPlatform,request);
+ handleTeleBootCmd(deviceForPlatform, request);
break;
case DRAG_ZOOM_IN:
- handleDragZoom(deviceForPlatform,channelId,rootElement,request,DeviceControlType.DRAG_ZOOM_IN);
+ handleDragZoom(deviceForPlatform, channelId, rootElement, request, DeviceControlType.DRAG_ZOOM_IN);
break;
case DRAG_ZOOM_OUT:
- handleDragZoom(deviceForPlatform,channelId,rootElement,request,DeviceControlType.DRAG_ZOOM_OUT);
+ handleDragZoom(deviceForPlatform, channelId, rootElement, request, DeviceControlType.DRAG_ZOOM_OUT);
break;
case HOME_POSITION:
- handleHomePositionCmd(deviceForPlatform,channelId,rootElement,request,DeviceControlType.HOME_POSITION);
+ handleHomePositionCmd(deviceForPlatform, channelId, rootElement, request, DeviceControlType.HOME_POSITION);
break;
default:
break;
@@ -153,17 +152,18 @@
/**
* 澶勭悊浜戝彴鎸囦护
- * @param device 璁惧
- * @param channelId 閫氶亾id
+ *
+ * @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());
+ 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));
+ errorResult -> onError(request, errorResult),
+ okResult -> onOk(request, okResult));
} catch (InvalidArgumentException | SipException | ParseException e) {
logger.error("[鍛戒护鍙戦�佸け璐 浜戝彴/鍓嶇: {}", e.getMessage());
}
@@ -171,12 +171,13 @@
/**
* 澶勭悊寮哄埗鍏抽敭甯�
- * @param device 璁惧
+ *
+ * @param device 璁惧
* @param channelId 閫氶亾id
*/
- private void handleIFameCmd(Device device,SIPRequest request,String channelId){
+ private void handleIFameCmd(Device device, SIPRequest request, String channelId) {
try {
- cmder.iFrameCmd(device,channelId);
+ cmder.iFrameCmd(device, channelId);
responseAck(request, Response.OK);
} catch (InvalidArgumentException | SipException | ParseException e) {
logger.error("[鍛戒护鍙戦�佸け璐 寮哄埗鍏抽敭甯�: {}", e.getMessage());
@@ -185,9 +186,10 @@
/**
* 澶勭悊閲嶅惎鍛戒护
+ *
* @param device 璁惧淇℃伅
*/
- private void handleTeleBootCmd(Device device,SIPRequest request){
+ private void handleTeleBootCmd(Device device, SIPRequest request) {
try {
cmder.teleBootCmd(device);
responseAck(request, Response.OK);
@@ -198,67 +200,82 @@
}
/**
- * 澶勭悊鎷夋鎺у埗
- * @param device 璁惧淇℃伅
- * @param channelId 閫氶亾id
+ * 澶勭悊鎷夋鎺у埗***
+ *
+ * @param device 璁惧淇℃伅
+ * @param channelId 閫氶亾id
* @param rootElement 鏍硅妭鐐�
- * @param type 娑堟伅绫诲瀷
+ * @param type 娑堟伅绫诲瀷
*/
- private void handleDragZoom(Device device,String channelId,Element rootElement,SIPRequest request,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");
+ private void handleDragZoom(Device device, String channelId, Element rootElement, SIPRequest request, DeviceControlType type) {
try {
- cmder.dragZoomCmd(device,channelId,cmdXml.toString());
+ DragZoomRequest dragZoomRequest = loadElement(rootElement, DragZoomRequest.class);
+ DragZoomRequest.DragZoom dragZoom = dragZoomRequest.getDragZoomIn();
+ if (dragZoom == null) {
+ dragZoom = dragZoomRequest.getDragZoomOut();
+ }
+ StringBuffer cmdXml = new StringBuffer(200);
+ cmdXml.append("<" + type.getVal() + ">\r\n");
+ cmdXml.append("<Length>" + dragZoom.getLength() + "</Length>\r\n");
+ cmdXml.append("<Width>" + dragZoom.getWidth() + "</Width>\r\n");
+ cmdXml.append("<MidPointX>" + dragZoom.getMidPointX() + "</MidPointX>\r\n");
+ cmdXml.append("<MidPointY>" + dragZoom.getMidPointY() + "</MidPointY>\r\n");
+ cmdXml.append("<LengthX>" + dragZoom.getLengthX() + "</LengthX>\r\n");
+ cmdXml.append("<LengthY>" + dragZoom.getLengthY() + "</LengthY>\r\n");
+ cmdXml.append("</" + type.getVal() + ">\r\n");
+ cmder.dragZoomCmd(device, channelId, cmdXml.toString());
responseAck(request, Response.OK);
- } catch (InvalidArgumentException | SipException | ParseException e) {
+ } catch (Exception e) {
logger.error("[鍛戒护鍙戦�佸け璐 鎷夋鎺у埗: {}", e.getMessage());
}
}
/**
- * 澶勭悊鐪嬪畧浣嶅懡浠�
- * @param device 璁惧淇℃伅
- * @param channelId 閫氶亾id
+ * 澶勭悊鐪嬪畧浣嶅懡浠�***
+ *
+ * @param device 璁惧淇℃伅
+ * @param channelId 閫氶亾id
* @param rootElement 鏍硅妭鐐�
- * @param request 璇锋眰淇℃伅
- * @param type 娑堟伅绫诲瀷
+ * @param request 璇锋眰淇℃伅
+ * @param type 娑堟伅绫诲瀷
*/
- private void handleHomePositionCmd(Device device,String channelId,Element rootElement,SIPRequest request,DeviceControlType type){
- //鑾峰彇鏁翠釜娑堟伅涓讳綋锛屾垜浠彧闇�瑕佷慨鏀硅姹傚ご鍗冲彲
- String cmdString = getText(rootElement,type.getVal());
+ private void handleHomePositionCmd(Device device, String channelId, Element rootElement, SIPRequest request, DeviceControlType type) {
try {
- cmder.homePositionCmd(device, channelId, cmdString,null,null,null,
- errorResult -> onError(request,errorResult),
- okResult -> onOk(request,okResult));
- } catch (InvalidArgumentException | SipException | ParseException e) {
+ HomePositionRequest homePosition = loadElement(rootElement, HomePositionRequest.class);
+ //鑾峰彇鏁翠釜娑堟伅涓讳綋锛屾垜浠彧闇�瑕佷慨鏀硅姹傚ご鍗冲彲
+ HomePositionRequest.HomePosition info = homePosition.getHomePosition();
+ cmder.homePositionCmd(device, channelId, info.getEnabled(), info.getResetTime(), info.getPresetIndex(),
+ errorResult -> onError(request, errorResult),
+ okResult -> onOk(request, okResult));
+ } catch (Exception e) {
logger.error("[鍛戒护鍙戦�佸け璐 鐪嬪畧浣嶈缃�: {}", e.getMessage());
}
}
/**
- * 澶勭悊鍛婅娑堟伅
- * @param device 璁惧淇℃伅
+ * 澶勭悊鍛婅娑堟伅***
+ *
+ * @param device 璁惧淇℃伅
* @param rootElement 鏍硅妭鐐�
- * @param request 璇锋眰淇℃伅
+ * @param request 璇锋眰淇℃伅
*/
- private void handleAlarmCmd(Device device,Element rootElement,SIPRequest 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");
+ List<Element> info = rootElement.elements("Info");
+ if (info != null) {
+ for (Element element : info) {
+ alarmMethod = getText(element, "AlarmMethod");
+ alarmType = getText(element, "AlarmType");
+ }
}
try {
- cmder.alarmCmd(device, alarmMethod,alarmType,
- errorResult -> onError(request,errorResult),
- okResult -> onOk(request,okResult));
+ cmder.alarmCmd(device, alarmMethod, alarmType,
+ errorResult -> onError(request, errorResult),
+ okResult -> onOk(request, okResult));
} catch (InvalidArgumentException | SipException | ParseException e) {
logger.error("[鍛戒护鍙戦�佸け璐 鍛婅娑堟伅: {}", e.getMessage());
}
@@ -266,19 +283,20 @@
/**
* 澶勭悊褰曞儚鎺у埗
- * @param device 璁惧淇℃伅
- * @param channelId 閫氶亾id
+ *
+ * @param device 璁惧淇℃伅
+ * @param channelId 閫氶亾id
* @param rootElement 鏍硅妭鐐�
- * @param request 璇锋眰淇℃伅
- * @param type 娑堟伅绫诲瀷
+ * @param request 璇锋眰淇℃伅
+ * @param type 娑堟伅绫诲瀷
*/
- private void handleRecordCmd(Device device,String channelId,Element rootElement,SIPRequest request,DeviceControlType type){
+ private void handleRecordCmd(Device device, String channelId, Element rootElement, SIPRequest request, DeviceControlType type) {
//鑾峰彇鏁翠釜娑堟伅涓讳綋锛屾垜浠彧闇�瑕佷慨鏀硅姹傚ご鍗冲彲
- String cmdString = getText(rootElement,type.getVal());
+ String cmdString = getText(rootElement, type.getVal());
try {
- cmder.recordCmd(device, channelId,cmdString,
- errorResult -> onError(request,errorResult),
- okResult -> onOk(request,okResult));
+ cmder.recordCmd(device, channelId, cmdString,
+ errorResult -> onError(request, errorResult),
+ okResult -> onOk(request, okResult));
} catch (InvalidArgumentException | SipException | ParseException e) {
logger.error("[鍛戒护鍙戦�佸け璐 褰曞儚鎺у埗: {}", e.getMessage());
}
@@ -286,18 +304,19 @@
/**
* 澶勭悊鎶ヨ甯冮槻/鎾ら槻鍛戒护
- * @param device 璁惧淇℃伅
+ *
+ * @param device 璁惧淇℃伅
* @param rootElement 鏍硅妭鐐�
- * @param request 璇锋眰淇℃伅
- * @param type 娑堟伅绫诲瀷
+ * @param request 璇锋眰淇℃伅
+ * @param type 娑堟伅绫诲瀷
*/
- private void handleGuardCmd(Device device,Element rootElement,SIPRequest request,DeviceControlType type){
+ private void handleGuardCmd(Device device, Element rootElement, SIPRequest request, DeviceControlType type) {
//鑾峰彇鏁翠釜娑堟伅涓讳綋锛屾垜浠彧闇�瑕佷慨鏀硅姹傚ご鍗冲彲
- String cmdString = getText(rootElement,type.getVal());
+ String cmdString = getText(rootElement, type.getVal());
try {
cmder.guardCmd(device, cmdString,
- errorResult -> onError(request,errorResult),
- okResult -> onOk(request,okResult));
+ errorResult -> onError(request, errorResult),
+ okResult -> onOk(request, okResult));
} catch (InvalidArgumentException | SipException | ParseException e) {
logger.error("[鍛戒护鍙戦�佸け璐 甯冮槻/鎾ら槻鍛戒护: {}", e.getMessage());
}
@@ -306,10 +325,11 @@
/**
* 閿欒鍝嶅簲澶勭悊
- * @param request 璇锋眰
+ *
+ * @param request 璇锋眰
* @param eventResult 鍝嶅簲缁撴瀯
*/
- private void onError(SIPRequest request, SipSubscribe.EventResult eventResult){
+ private void onError(SIPRequest request, SipSubscribe.EventResult eventResult) {
// 澶辫触鐨勫洖澶�
try {
responseAck(request, eventResult.statusCode, eventResult.msg);
@@ -317,12 +337,14 @@
logger.error("[鍛戒护鍙戦�佸け璐 鍥炲: {}", e.getMessage());
}
}
+
/**
* 鎴愬姛鍝嶅簲澶勭悊
- * @param request 璇锋眰
+ *
+ * @param request 璇锋眰
* @param eventResult 鍝嶅簲缁撴瀯
*/
- private void onOk(SIPRequest request, SipSubscribe.EventResult eventResult){
+ private void onOk(SIPRequest request, SipSubscribe.EventResult eventResult) {
// 鎴愬姛鐨勫洖澶�
try {
responseAck(request, eventResult.statusCode);
--
Gitblit v1.8.0