From 7d1116c8928770cd7703c83955d77f1e6a430ce3 Mon Sep 17 00:00:00 2001 From: mk1990 <37614016+mk1990@users.noreply.github.com> Date: 星期四, 21 四月 2022 13:34:50 +0800 Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 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 ba6eed5..09e7a04 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 @@ -20,8 +20,8 @@ /** * 鍩轰簬dom4j鐨勫伐鍏峰寘 - * - * + * + * */ public class XmlUtil { /** @@ -31,9 +31,9 @@ /** * 瑙f瀽XML涓篋ocument瀵硅薄 - * + * * @param xml 琚В鏋愮殑XMl - * + * * @return Document */ public static Element parseXml(String xml) { @@ -51,7 +51,7 @@ /** * 鑾峰彇element瀵硅薄鐨則ext鐨勫�� - * + * * @param em 鑺傜偣鐨勫璞� * @param tag 鑺傜偣鐨則ag * @return 鑺傜偣 @@ -62,12 +62,12 @@ } Element e = em.element(tag); // - return null == e ? null : e.getText(); + return null == e ? null : e.getText().trim(); } /** * 閫掑綊瑙f瀽xml鑺傜偣锛岄�傜敤浜� 澶氳妭鐐规暟鎹� - * + * * @param node node * @param nodeName nodeName * @return List<Map<String, Object>> @@ -106,7 +106,7 @@ /** * xml杞琷son - * + * * @param element * @param json */ -- Gitblit v1.8.0