From 2177e9dbf988188297b416dc78b0a4a587b0fdd7 Mon Sep 17 00:00:00 2001
From: wangyimeng <421132955@qq.com>
Date: 星期六, 04 三月 2023 20:55:48 +0800
Subject: [PATCH] 修复查询历史录像无记录时报错问题
---
src/main/java/com/genersoft/iot/vmp/common/enums/DeviceControlType.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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..02202d8 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,19 +1,14 @@
package com.genersoft.iot.vmp.common.enums;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
import org.dom4j.Element;
import org.springframework.util.ObjectUtils;
-import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
/**
* @author gaofuwang
* @date 2023/01/18/ 10:09:00
* @since 1.0
*/
-@Getter
-@AllArgsConstructor
public enum DeviceControlType {
/**
@@ -58,9 +53,22 @@
private final String desc;
+ DeviceControlType(String val, String desc) {
+ this.val = val;
+ this.desc = desc;
+ }
+
+ public String getVal() {
+ return val;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
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