From c084d6c98af1ef4d36a61adc719df5db76589428 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 07 十月 2023 18:00:08 +0800
Subject: [PATCH] 优化国标级联心跳失败判断逻辑

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java |  335 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 275 insertions(+), 60 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
old mode 100644
new mode 100755
index f072224..b2dd76b
--- 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,16 +1,17 @@
 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.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;
 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;
@@ -21,17 +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.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 {
@@ -75,41 +73,43 @@
         String channelId = getText(rootElement, "DeviceID");
         // 杩滅▼鍚姩鍔熻兘
         if (!ObjectUtils.isEmpty(getText(rootElement, "TeleBoot"))) {
-            if (parentPlatform.getServerGBId().equals(targetGBId)) {
-                // 杩滅▼鍚姩鏈钩鍙帮細闇�瑕佸湪閲嶆柊鍚姩绋嬪簭鍚庡厛瀵筍ipStack瑙g粦
-                logger.info("鎵ц杩滅▼鍚姩鏈钩鍙板懡浠�");
-                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());
-//                    }
-                });
-            } else {
-                // 杩滅▼鍚姩鎸囧畾璁惧
-            }
+            // TODO 鎷掔粷杩滅▼鍚姩鍛戒护
+            logger.warn("[鍥芥爣绾ц仈]鏀跺埌骞冲彴鐨勮繙绋嬪惎鍔ㄥ懡浠わ紝 涓嶅鐞�");
+
+//            if (parentPlatform.getServerGBId().equals(targetGBId)) {
+//                // 杩滅▼鍚姩鏈钩鍙帮細闇�瑕佸湪閲嶆柊鍚姩绋嬪簭鍚庡厛瀵筍ipStack瑙g粦
+//                logger.info("鎵ц杩滅▼鍚姩鏈钩鍙板懡浠�");
+//                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());
+////                    }
+//                });
+//            }
         }
-        // 浜戝彴/鍓嶇鎺у埗鍛戒护
-        if (!ObjectUtils.isEmpty(getText(rootElement,"PTZCmd")) && !parentPlatform.getServerGBId().equals(targetGBId)) {
-            String cmdString = getText(rootElement,"PTZCmd");
+        DeviceControlType deviceControlType = DeviceControlType.typeOf(rootElement);
+        logger.info("[鎺ュ彈deviceControl鍛戒护] 鍛戒护: {}", deviceControlType);
+        if (!ObjectUtils.isEmpty(deviceControlType) && !parentPlatform.getServerGBId().equals(targetGBId)) {
+            //鍒ゆ柇鏄惁瀛樺湪璇ラ�氶亾
             Device deviceForPlatform = storager.queryVideoDeviceByPlatformIdAndChannelId(parentPlatform.getServerGBId(), channelId);
             if (deviceForPlatform == null) {
                 try {
@@ -119,25 +119,240 @@
                 }
                 return;
             }
-            try {
-                cmder.fronEndCmd(deviceForPlatform, channelId, cmdString, eventResult -> {
-                    // 澶辫触鐨勫洖澶�
-                    try {
-                        responseAck(request, eventResult.statusCode, eventResult.msg);
-                    } catch (SipException | InvalidArgumentException | ParseException e) {
-                        logger.error("[鍛戒护鍙戦�佸け璐 浜戝彴/鍓嶇鍥炲: {}", e.getMessage());
-                    }
-                }, eventResult -> {
-                    // 鎴愬姛鐨勫洖澶�
-                    try {
-                        responseAck(request, eventResult.statusCode);
-                    } catch (SipException | InvalidArgumentException | ParseException e) {
-                        logger.error("[鍛戒护鍙戦�佸け璐 浜戝彴/鍓嶇鍥炲: {}", e.getMessage());
-                    }
-                });
-            } catch (InvalidArgumentException | SipException | ParseException e) {
-                logger.error("[鍛戒护鍙戦�佸け璐 浜戝彴/鍓嶇: {}", e.getMessage());
+            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, request, channelId);
+                    break;
+                case TELE_BOOT:
+                    handleTeleBootCmd(deviceForPlatform, request);
+                    break;
+                case 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);
+                    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, SIPRequest request, String channelId) {
+        try {
+            cmder.iFrameCmd(device, channelId);
+            responseAck(request, Response.OK);
+        } catch (InvalidArgumentException | SipException | ParseException e) {
+            logger.error("[鍛戒护鍙戦�佸け璐 寮哄埗鍏抽敭甯�: {}", e.getMessage());
+        }
+    }
+
+    /**
+     * 澶勭悊閲嶅惎鍛戒护
+     *
+     * @param device 璁惧淇℃伅
+     */
+    private void handleTeleBootCmd(Device device, SIPRequest request) {
+        try {
+            cmder.teleBootCmd(device);
+            responseAck(request, Response.OK);
+        } 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, SIPRequest request, DeviceControlType type) {
+        try {
+            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 (Exception 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) {
+        try {
+            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 rootElement 鏍硅妭鐐�
+     * @param request     璇锋眰淇℃伅
+     */
+    private void handleAlarmCmd(Device device, Element rootElement, SIPRequest request) {
+        //鍛婅鏂规硶
+        String alarmMethod = "";
+        //鍛婅绫诲瀷
+        String 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));
+        } 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),
+                    okResult -> onOk(request, okResult));
+        } 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),
+                    okResult -> onOk(request, okResult));
+        } 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