增加新的静态文件放过

src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java

@@ -75,6 +75,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
             matchers.add("/js/**");
             matchers.add("/api/device/query/snap/**");
             matchers.add("/record_proxy/*/**");
+            matchers.add("/_app.config.js");
+            matchers.add("/assets/**");
+            matchers.add("/resource/**");
+            matchers.add("/favicon.ico");
             matchers.addAll(userSetting.getInterfaceAuthenticationExcludes());
             // 可以直接访问的静态数据
             web.ignoring().antMatchers(matchers.toArray(new String[0]));

src/main/java/com/genersoft/iot/vmp/service/impl/CommonGbChannelServiceImpl.java

@@ -1,5 +1,6 @@
 package com.genersoft.iot.vmp.service.impl;
 
+import com.genersoft.iot.vmp.common.CivilCodePo;
 import com.genersoft.iot.vmp.common.CommonGbChannel;
 import com.genersoft.iot.vmp.conf.CivilCodeFileConf;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -128,9 +129,14 @@ public class CommonGbChannelServiceImpl implements ICommonGbChannelService {
                     &&
                     !regionMap.containsKey(deviceChannel.getChannelId())
                 ) {
+                    CivilCodePo parentCivilCodePo = civilCodeFileConf.getParentCode(deviceChannel.getChannelId());
+                    String civilCode = null;
+                    if (parentCivilCodePo != null) {
+                        civilCode = parentCivilCodePo.getCode();
+                    }
                     // 行政区划条目
                     Region region = Region.getInstance(deviceChannel.getChannelId(), deviceChannel.getName(),
-                            civilCodeFileConf.getParentCode(deviceChannel.getChannelId()).getCode());
+                            civilCode);
                     regionMap.put(deviceChannel.getChannelId(), region);
                 }
                 if (channelIdType == Gb28181CodeType.BUSINESS_GROUP
@@ -386,6 +392,7 @@ public class CommonGbChannelServiceImpl implements ICommonGbChannelService {
             commonGbChannel.setCommonGbManufacturer(deviceChannel.getManufacture());
             commonGbChannel.setCommonGbModel(deviceChannel.getModel());
             commonGbChannel.setCommonGbOwner(deviceChannel.getOwner());
+            if (deviceChannel.getCivilCode() != null) {
                 Gb28181CodeType channelIdType = SipUtils.getChannelIdType(deviceChannel.getCivilCode());
                 if (channelIdType == Gb28181CodeType.CIVIL_CODE_PROVINCE
                         || channelIdType == Gb28181CodeType.CIVIL_CODE_CITY
@@ -399,6 +406,7 @@ public class CommonGbChannelServiceImpl implements ICommonGbChannelService {
                             deviceChannel.getChannelId(),
                             deviceChannel.getCivilCode());
                 }
+            }
 
             commonGbChannel.setCommonGbCivilCode(deviceChannel.getCivilCode());
             commonGbChannel.setCommonGbBlock(deviceChannel.getBlock());
@@ -443,6 +451,9 @@ public class CommonGbChannelServiceImpl implements ICommonGbChannelService {
                         commonGbChannel.setCommonGbOwner(deviceChannel.getOwner());
                         break;
                     case "commonGbCivilCode":
+                        if (deviceChannel.getCivilCode() == null) {
+                            break;
+                        }
                         Gb28181CodeType channelIdType = SipUtils.getChannelIdType(deviceChannel.getCivilCode());
                         if (channelIdType == Gb28181CodeType.CIVIL_CODE_PROVINCE
                                 || channelIdType == Gb28181CodeType.CIVIL_CODE_CITY