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/common/enums/DeviceControlType.java | 4 +++- 1 files changed, 3 insertions(+), 1 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; } } -- Gitblit v1.8.0