From ef5018de2d86bd4728a75ddc0eccd11b812375dc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 七月 2023 14:57:30 +0800
Subject: [PATCH] 修复合并错误
---
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
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 2117c1d..a08231c 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
@@ -8,6 +8,7 @@
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
import com.genersoft.iot.vmp.utils.DateUtil;
+import org.apache.commons.lang3.math.NumberUtils;
import org.dom4j.Attribute;
import org.dom4j.Document;
import org.dom4j.DocumentException;
@@ -225,7 +226,7 @@
}else {
logger.warn("[xml瑙ｆ瀽] 鏃犳硶纭畾琛屾斂鍖哄垝{}鐨勪笂绾ц鏀垮尯鍒�", channelId);
}
- deviceChannel.setStatus(1);
+ deviceChannel.setStatus(true);
return deviceChannel;
}else {
if(channelId.length() != 20) {
@@ -284,7 +285,7 @@
if (!ObjectUtils.isEmpty(address)) {
deviceChannel.setAddress(address);
}
- deviceChannel.setStatus(1);
+ deviceChannel.setStatus(true);
if (!ObjectUtils.isEmpty(registerWay)) {
try {
deviceChannel.setRegisterWay(Integer.parseInt(registerWay));
@@ -298,7 +299,7 @@
return deviceChannel;
case 215:
// 涓氬姟鍒嗙粍
- deviceChannel.setStatus(1);
+ deviceChannel.setStatus(true);
if (!ObjectUtils.isEmpty(parentID)) {
if (!parentID.trim().equalsIgnoreCase(device.getDeviceId())) {
deviceChannel.setParentId(parentID);
@@ -312,11 +313,10 @@
break;
case 216:
// 铏氭嫙缁勭粐
- deviceChannel.setStatus(1);
+ deviceChannel.setStatus(true);
if (!ObjectUtils.isEmpty(businessGroupID)) {
deviceChannel.setBusinessGroupId(businessGroupID);
}
-
if (!ObjectUtils.isEmpty(parentID)) {
if (parentID.contains("/")) {
@@ -341,7 +341,11 @@
if (!ObjectUtils.isEmpty(owner)) {
deviceChannel.setOwner(owner);
}
- if (!ObjectUtils.isEmpty(civilCode)) {
+ if (!ObjectUtils.isEmpty(civilCode)
+ && civilCode.length() <= 8
+ && NumberUtils.isParsable(civilCode)
+ && Integer.parseInt(civilCode)%2 == 0
+ ) {
deviceChannel.setCivilCode(civilCode);
}
if (!ObjectUtils.isEmpty(businessGroupID)) {
@@ -376,19 +380,24 @@
}
}
// 鐖惰澶�/鍖哄煙/绯荤粺ID
- String realParentId = parentID;
- if (!ObjectUtils.isEmpty(parentID)) {
+
+ if (!ObjectUtils.isEmpty(parentID) ) {
if (parentID.contains("/")) {
String[] parentIdArray = parentID.split("/");
- realParentId = parentIdArray[parentIdArray.length - 1];
+ deviceChannel.setParentId(parentIdArray[parentIdArray.length - 1]);
+ }else {
+ if (parentID.length()%2 == 0) {
+ deviceChannel.setParentId(parentID);
+ }else {
+ logger.warn("[xml瑙ｆ瀽] 涓嶈鑼冪殑parentID锛歿}, 宸茶垗寮�", parentID);
+ }
}
- deviceChannel.setParentId(realParentId);
}else {
if (!ObjectUtils.isEmpty(businessGroupID)) {
deviceChannel.setParentId(businessGroupID);
}else {
- if (!ObjectUtils.isEmpty(civilCode)) {
- deviceChannel.setParentId(civilCode);
+ if (!ObjectUtils.isEmpty(deviceChannel.getCivilCode())) {
+ deviceChannel.setParentId(deviceChannel.getCivilCode());
}
}
}
@@ -476,13 +485,13 @@
if (status != null) {
// ONLINE OFFLINE HIKVISION DS-7716N-E4 NVR鐨勫吋瀹规�у鐞�
if (status.equals("ON") || status.equals("On") || status.equals("ONLINE") || status.equals("OK")) {
- deviceChannel.setStatus(1);
+ deviceChannel.setStatus(true);
}
if (status.equals("OFF") || status.equals("Off") || status.equals("OFFLINE")) {
- deviceChannel.setStatus(0);
+ deviceChannel.setStatus(false);
}
}else {
- deviceChannel.setStatus(1);
+ deviceChannel.setStatus(true);
}
// 缁忓害
--
Gitblit v1.8.0