648540858
2023-08-17 d9cfe061b9b501511f5d769f751c8ff6bbcb1bf9
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
@@ -344,7 +344,7 @@
                    if (!ObjectUtils.isEmpty(civilCode)
                            && civilCode.length() <= 8
                            && NumberUtils.isParsable(civilCode)
                            && Integer.parseInt(civilCode)%2 == 0
                            && civilCode.length()%2 == 0
                    ) {
                        deviceChannel.setCivilCode(civilCode);
                    }
@@ -380,13 +380,18 @@
                        }
                    }
                    // 父设备/区域/系统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);