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/bean/DragZoomRequest.java                                                             |   70 ++++++++
 src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java                                                    |    9 +
 src/main/java/com/genersoft/iot/vmp/common/enums/DeviceControlType.java                                                           |    4 
 src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java                                                                    |   79 +++++++++
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java                                                   |   31 +--
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java                                                    |    2 
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java |  188 +++++++++++++----------
 src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java                                                       |    3 
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/HomePositionRequest.java                                                         |   50 ++++++
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java                                                       |    2 
 src/main/java/com/genersoft/iot/vmp/gb28181/utils/MessageElement.java                                                             |   17 ++
 11 files changed, 350 insertions(+), 105 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/common/enums/DeviceControlType.java b/src/main/java/com/genersoft/iot/vmp/common/enums/DeviceControlType.java
index 3b801d2..5a046fa 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/enums/DeviceControlType.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/enums/DeviceControlType.java
@@ -1,5 +1,7 @@
 package com.genersoft.iot.vmp.common.enums;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.dom4j.Element;
@@ -60,7 +62,7 @@
 
     public static DeviceControlType typeOf(Element rootElement) {
         for (DeviceControlType item : DeviceControlType.values()) {
-            if (!ObjectUtils.isEmpty(getText(rootElement,item.val))) {
+            if (!ObjectUtils.isEmpty(rootElement.element(item.val)) || !ObjectUtils.isEmpty(rootElement.elements(item.val))) {
                 return item;
             }
         }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DragZoomRequest.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DragZoomRequest.java
new file mode 100644
index 0000000..d8b7690
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DragZoomRequest.java
@@ -0,0 +1,70 @@
+package com.genersoft.iot.vmp.gb28181.bean;
+
+import com.genersoft.iot.vmp.gb28181.utils.MessageElement;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 璁惧淇℃伅鏌ヨ鍝嶅簲
+ *
+ * @author Y.G
+ * @version 1.0
+ * @date 2022/6/28 14:55
+ */
+@Data
+public class DragZoomRequest {
+    /**
+     * 搴忓垪鍙�
+     */
+    @MessageElement("SN")
+    private String sn;
+
+    @MessageElement("DeviceID")
+    private String deviceId;
+
+    @MessageElement(value = "DragZoomIn")
+    private DragZoom dragZoomIn;
+
+    @MessageElement(value = "DragZoomOut")
+    private DragZoom dragZoomOut;
+
+    /**
+     * 鍩烘湰鍙傛暟
+     */
+    @Data
+    public static class DragZoom {
+        /**
+         * 鎾斁绐楀彛闀垮害鍍忕礌鍊�
+         */
+        @MessageElement("Length")
+        protected Integer length;
+        /**
+         * 鎾斁绐楀彛瀹藉害鍍忕礌鍊�
+         */
+        @MessageElement("Width")
+        protected Integer width;
+        /**
+         * 鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��
+         */
+        @MessageElement("MidPointX")
+        protected Integer midPointX;
+        /**
+         * 鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��
+         */
+        @MessageElement("MidPointY")
+        protected Integer midPointY;
+        /**
+         * 鎷夋闀垮害鍍忕礌鍊�
+         */
+        @MessageElement("LengthX")
+        protected Integer lengthX;
+        /**
+         * 鎷夋瀹藉害鍍忕礌鍊�
+         */
+        @MessageElement("LengthY")
+        protected Integer lengthY;
+
+    }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/HomePositionRequest.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/HomePositionRequest.java
new file mode 100644
index 0000000..b0fff21
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/HomePositionRequest.java
@@ -0,0 +1,50 @@
+package com.genersoft.iot.vmp.gb28181.bean;
+
+import com.genersoft.iot.vmp.gb28181.utils.MessageElement;
+import lombok.Data;
+
+/**
+ * 璁惧淇℃伅鏌ヨ鍝嶅簲
+ *
+ * @author Y.G
+ * @version 1.0
+ * @date 2022/6/28 14:55
+ */
+@Data
+public class HomePositionRequest {
+    /**
+     * 搴忓垪鍙�
+     */
+    @MessageElement("SN")
+    private String sn;
+
+    @MessageElement("DeviceID")
+    private String deviceId;
+
+    @MessageElement(value = "HomePosition")
+    private HomePosition homePosition;
+
+
+    /**
+     * 鍩烘湰鍙傛暟
+     */
+    @Data
+    public static class HomePosition {
+        /**
+         * 鎾斁绐楀彛闀垮害鍍忕礌鍊�
+         */
+        @MessageElement("Enabled")
+        protected String enabled;
+        /**
+         * 鎾斁绐楀彛瀹藉害鍍忕礌鍊�
+         */
+        @MessageElement("ResetTime")
+        protected String resetTime;
+        /**
+         * 鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��
+         */
+        @MessageElement("PresetIndex")
+        protected String presetIndex;
+
+    }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
index e9b2039..1f1d10a 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
@@ -226,7 +226,7 @@
 	 * @param resetTime   鑷姩褰掍綅鏃堕棿闂撮殧锛屽紑鍚湅瀹堜綅鏃朵娇鐢紝鍗曚綅:绉�(s)
 	 * @param presetIndex 璋冪敤棰勭疆浣嶇紪鍙凤紝寮�鍚湅瀹堜綅鏃朵娇鐢紝鍙栧�艰寖鍥�0~255
 	 */
-	void homePositionCmd(Device device, String channelId,String frontCmd, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent,SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException;
+	void homePositionCmd(Device device, String channelId, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent,SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException;
 
 	/**
 	 * 璁惧閰嶇疆鍛戒护
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 6937641..fbd9ece 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
@@ -808,7 +808,7 @@
      * @param presetIndex 璋冪敤棰勭疆浣嶇紪鍙凤紝寮�鍚湅瀹堜綅鏃朵娇鐢紝鍙栧�艰寖鍥�0~255
      */
     @Override
-    public void homePositionCmd(Device device, String channelId,String frontCmd, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent,SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {
+    public void homePositionCmd(Device device, String channelId, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent,SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {
 
         StringBuffer cmdXml = new StringBuffer(200);
         String charset = device.getCharset();
@@ -822,26 +822,21 @@
             cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
         }
         cmdXml.append("<HomePosition>\r\n");
-        if (StringUtils.hasText(frontCmd)){
-            cmdXml.append(frontCmd);
-        }else{
-            if (NumericUtil.isInteger(enabled) && (!enabled.equals("0"))) {
-                cmdXml.append("<Enabled>1</Enabled>\r\n");
-                if (NumericUtil.isInteger(resetTime)) {
-                    cmdXml.append("<ResetTime>" + resetTime + "</ResetTime>\r\n");
-                } else {
-                    cmdXml.append("<ResetTime>0</ResetTime>\r\n");
-                }
-                if (NumericUtil.isInteger(presetIndex)) {
-                    cmdXml.append("<PresetIndex>" + presetIndex + "</PresetIndex>\r\n");
-                } else {
-                    cmdXml.append("<PresetIndex>0</PresetIndex>\r\n");
-                }
+        if (NumericUtil.isInteger(enabled) && (!enabled.equals("0"))) {
+            cmdXml.append("<Enabled>1</Enabled>\r\n");
+            if (NumericUtil.isInteger(resetTime)) {
+                cmdXml.append("<ResetTime>" + resetTime + "</ResetTime>\r\n");
             } else {
-                cmdXml.append("<Enabled>0</Enabled>\r\n");
+                cmdXml.append("<ResetTime>0</ResetTime>\r\n");
             }
+            if (NumericUtil.isInteger(presetIndex)) {
+                cmdXml.append("<PresetIndex>" + presetIndex + "</PresetIndex>\r\n");
+            } else {
+                cmdXml.append("<PresetIndex>0</PresetIndex>\r\n");
+            }
+        } else {
+            cmdXml.append("<Enabled>0</Enabled>\r\n");
         }
-
         cmdXml.append("</HomePosition>\r\n");
         cmdXml.append("</Control>\r\n");
 
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);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/MessageElement.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/MessageElement.java
new file mode 100644
index 0000000..f94237c
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/MessageElement.java
@@ -0,0 +1,17 @@
+package com.genersoft.iot.vmp.gb28181.utils;
+
+import java.lang.annotation.*;
+
+/**
+ * @author gaofuwang
+ * @version 1.0
+ * @date 2022/6/28 14:58
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface MessageElement {
+    String value();
+
+    String subVal() default "";
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
index 35d563d..0ea6d87 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
@@ -1,5 +1,6 @@
 package com.genersoft.iot.vmp.gb28181.utils;
 
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -15,12 +16,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
+import org.springframework.util.ReflectionUtils;
 
 import javax.sip.RequestEvent;
 import javax.sip.message.Request;
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 import java.util.*;
 
 /**
@@ -411,4 +416,76 @@
         }
         return deviceChannel;
     }
+
+    /**
+     * 鏂板鏂规硶鏀寔鍐呴儴宓屽
+     *
+     * @param element xmlElement
+     * @param clazz 缁撴灉绫�
+     * @param <T> 娉涘瀷
+     * @return 缁撴灉瀵硅薄
+     * @throws NoSuchMethodException
+     * @throws InvocationTargetException
+     * @throws InstantiationException
+     * @throws IllegalAccessException
+     */
+    public static <T> T loadElement(Element element, Class<T> clazz) throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
+        Field[] fields = clazz.getDeclaredFields();
+        T t = clazz.getDeclaredConstructor().newInstance();
+        for (Field field : fields) {
+            ReflectionUtils.makeAccessible(field);
+            MessageElement annotation = field.getAnnotation(MessageElement.class);
+            if (annotation == null) {
+                continue;
+            }
+            String value = annotation.value();
+            String subVal = annotation.subVal();
+            Element element1 = element.element(value);
+            if (element1 == null) {
+                continue;
+            }
+            if ("".equals(subVal)) {
+                // 鏃犱笅绾ф暟鎹�
+                Object fieldVal = element1.isTextOnly() ? element1.getText() : loadElement(element1, field.getType());
+                Object o = simpleTypeDeal(field.getType(), fieldVal);
+                ReflectionUtils.setField(field, t,  o);
+            } else {
+                // 瀛樺湪涓嬬骇鏁版嵁
+                ArrayList<Object> list = new ArrayList<>();
+                Type genericType = field.getGenericType();
+                if (!(genericType instanceof ParameterizedType)) {
+                    continue;
+                }
+                Class<?> aClass = (Class<?>) ((ParameterizedType) genericType).getActualTypeArguments()[0];
+                for (Element element2 : element1.elements(subVal)) {
+                    list.add(loadElement(element2, aClass));
+                }
+                ReflectionUtils.setField(field, t, list);
+            }
+        }
+        return t;
+    }
+
+    /**
+     * 绠�鍗曠被鍨嬪鐞�
+     *
+     * @param tClass
+     * @param val
+     * @return
+     */
+    private static Object simpleTypeDeal(Class<?> tClass, Object val) {
+        if (tClass.equals(String.class)) {
+            return val.toString();
+        }
+        if (tClass.equals(Integer.class)) {
+            return Integer.valueOf(val.toString());
+        }
+        if (tClass.equals(Double.class)) {
+            return Double.valueOf(val.toString());
+        }
+        if (tClass.equals(Long.class)) {
+            return Long.valueOf(val.toString());
+        }
+        return val;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
index 35a42c5..ae130cf 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
@@ -114,4 +114,7 @@
             "         left join device d on dc.deviceId = d.deviceId\n" +
             "where dc.channelId = #{channelId} and pgc.platformId=#{platformId}")
     List<Device> queryDeviceInfoByPlatformIdAndChannelId(String platformId, String channelId);
+
+    @Select("SELECT pgc.platformId FROM platform_gb_channel pgc left join device_channel dc on dc.id = pgc.deviceChannelId WHERE dc.channelId='${channelId}'")
+    List<String> queryParentPlatformByChannelId(String channelId);
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
index 41cabad..35656dd 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
@@ -133,6 +133,15 @@
 					if (allChannelMap.containsKey(deviceChannel.getChannelId())) {
 						deviceChannel.setStreamId(allChannelMap.get(deviceChannel.getChannelId()).getStreamId());
 						deviceChannel.setHasAudio(allChannelMap.get(deviceChannel.getChannelId()).isHasAudio());
+						if (allChannelMap.get(deviceChannel.getChannelId()).getStatus() !=deviceChannel.getStatus()){
+							List<String> strings = platformChannelMapper.queryParentPlatformByChannelId(deviceChannel.getChannelId());
+							if (!CollectionUtils.isEmpty(strings)){
+								strings.forEach(platformId->{
+									eventPublisher.catalogEventPublish(platformId, deviceChannel, deviceChannel.getStatus()==1?CatalogEvent.ON:CatalogEvent.OFF);
+								});
+							}
+
+						}
 					}
 					channels.add(deviceChannel);
 					if (!ObjectUtils.isEmpty(deviceChannel.getParentId())) {
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
index 3e1b423..ff0d8b4 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
@@ -268,7 +268,7 @@
 		String uuid = UUID.randomUUID().toString();
 		Device device = storager.queryVideoDevice(deviceId);
 		try {
-			cmder.homePositionCmd(device, channelId,null, enabled, resetTime, presetIndex, event -> {
+			cmder.homePositionCmd(device, channelId, enabled, resetTime, presetIndex, event -> {
 				RequestMessage msg = new RequestMessage();
 				msg.setId(uuid);
 				msg.setKey(key);

--
Gitblit v1.8.0