Merge branch 'master_dev' into 'master'

Master dev

See merge request yunteng/thingskit!366

@@ -275,21 +275,8 @@ public class TKXmlUtil {
       deviceChannel.setStatus(StatusEnum.ONLINE);
     }
 
-    if (channelId.length() <= 8) {
-      deviceChannel.setHasAudio(false);
-      String parentCode = getParentCivilCode(channelId);
-      if (StringUtils.isNotBlank(parentCode)) {
-//        deviceChannel.parentId(parentCode);
-        deviceChannel.setCivilCode(parentCode);
-      } else {
-        log.warn("[xml解析] 无法确定行政区划{}的上级行政区划", channelId);
-      }
-      return deviceChannel;
-    } else {
-      if (channelId.length() != 20) {
-        log.warn("[xml解析] 失败，编号不符合国标28181定义： {}", channelId);
-        return null;
-      }
+    if (channelId.length() == 20) {
+
 
       int code = Integer.parseInt(channelId.substring(10, 13));
       deviceChannel.setHasAudio(code == 136 || code == 137 || code == 138);
@@ -595,6 +582,15 @@ public class TKXmlUtil {
           deviceChannel.setTenantId(tenantId);
           break;
       }
+    } else {
+      deviceChannel.setHasAudio(false);
+      String parentCode = getParentCivilCode(channelId);
+      if (StringUtils.isNotBlank(parentCode)) {
+//        deviceChannel.parentId(parentCode);
+        deviceChannel.setCivilCode(parentCode);
+      } else {
+        log.warn("[xml解析] 无法确定行政区划{}的上级行政区划", channelId);
+      }
     }
 
     return deviceChannel;