gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

白名单、packed、stream导出

Browse Source
This commit is contained in:
leijun
2018-10-17 10:36:38 +08:00
parent f7cbf39325
commit e71d14254b
16 changed files with 553 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
View File

@@ -926,6 +926,10 @@ public class AvContentCfgService extends BaseService{
Map<String,List> ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList);
groupRelationList=ipMap.get("groupList");
ipRegionList=ipMap.get("dstList");
if (ipMap.get("numRegionList") != null) {
numRegionList.addAll(ipMap.get("numRegionList"));
}
}
if(!StringUtil.isEmpty(areaIpCfgList)){
Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
@@ -1261,6 +1265,9 @@ public class AvContentCfgService extends BaseService{
Map<String,List> ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList);
groupRelationList=ipMap.get("groupList");
ipRegionList=ipMap.get("dstList");
if (ipMap.get("numRegionList") != null) {
numRegionList.addAll(ipMap.get("numRegionList"));
}
}
if(!StringUtil.isEmpty(areaIpCfgList)){