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

音视频文本去掉区域id的单独处理

Browse Source 
增加表达式，默认匹配方式为子串匹配
voip列表字符串信息显示属性位置调整
This commit is contained in:
duandongmei
2018-06-11 13:59:42 +08:00
parent ffc3c775af
commit bf8db3e47e
3 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -353,7 +353,6 @@ public class AvContentCfgService extends BaseService{
if(isAudit==1){
if(!StringUtil.isEmpty(voipIpList)){
//TODO DELETE后期删除
entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds());
for (AvVoipIpCfg ipCfg : voipIpList) {
ipCfg.setCfgType("MM_VOIP_IP");
}
@@ -364,7 +363,6 @@ public class AvContentCfgService extends BaseService{
if(!StringUtil.isEmpty(voipAccountList)){
//TODO DELETE后期删除
entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds());
for (AvVoipAccountCfg accountCfg : voipAccountList) {
accountCfg.setCfgType("MM_VOIP_ACCOUNT");
}
@@ -395,8 +393,6 @@ public class AvContentCfgService extends BaseService{
maatCfg.setDigestRegionList(digestRegionList);
maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setGroupNum(groupRelationList.size());
//TODO 后期修改
maatCfg.setUserRegion(entity.getCompileId()+"");
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(entity.getIsValid());
configCompileList.add(maatCfg);
@@ -657,7 +653,6 @@ public class AvContentCfgService extends BaseService{
if(isAudit==1){
if(!StringUtil.isEmpty(list)){
//TODO DELETE后期删除
entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds());
for (BaseIpCfg ipCfg : list) {
ipCfg.setCfgType("MM_AV_IP");
}
@@ -665,10 +660,6 @@ public class AvContentCfgService extends BaseService{
groupRelationList=ipMap.get("groupList");
ipRegionList=ipMap.get("dstList");
}
//TODO DELETE后期删除
for (AreaIpCfg areaIpCfga : areaIpCfgList) {
areaIpCfga.setCfgType("NTC_IP_RANGE");
}
if(!StringUtil.isEmpty(areaIpCfgList)){
//TODO DELETE后期删除
for (AreaIpCfg areaIpCfga : areaIpCfgList) {
@@ -692,8 +683,6 @@ public class AvContentCfgService extends BaseService{
maatCfg.setDigestRegionList(digestRegionList);
maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setGroupNum(groupRelationList.size());
//TODO 后期修改
maatCfg.setUserRegion(entity.getCompileId()+"");
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(entity.getIsValid());
configCompileList.add(maatCfg);
@@ -952,7 +941,6 @@ public class AvContentCfgService extends BaseService{
if(!StringUtil.isEmpty(list)){
//TODO DELETE后期删除
entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds());
for (BaseIpCfg ipCfg : list) {
ipCfg.setCfgType("MM_PIC_IP");
}
@@ -984,8 +972,6 @@ public class AvContentCfgService extends BaseService{
maatCfg.setDigestRegionList(digestRegionList);
maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setGroupNum(groupRelationList.size());
//TODO 后期修改
maatCfg.setUserRegion(entity.getCompileId()+"");
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(entity.getIsValid());
configCompileList.add(maatCfg);
@@ -1209,7 +1195,6 @@ public class AvContentCfgService extends BaseService{
if(isAudit==1){
if(!StringUtil.isEmpty(list)){
//TODO DELETE后期删除
entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds());
for (BaseStringCfg strCfg : list) {
strCfg.setCfgType("MM_AV_URL");
}
@@ -1241,8 +1226,6 @@ public class AvContentCfgService extends BaseService{
maatCfg.setDigestRegionList(digestRegionList);
maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setGroupNum(groupRelationList.size());
//TODO 后期修改
maatCfg.setUserRegion(entity.getCompileId()+"");
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(entity.getIsValid());
configCompileList.add(maatCfg);
@@ -1465,7 +1448,6 @@ public class AvContentCfgService extends BaseService{
if(isAudit==1){
if(!StringUtil.isEmpty(list)){
//TODO DELETE后期删除
entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds());
for (BaseStringCfg strCfg : list) {
strCfg.setCfgType("MM_PIC_URL");
}
@@ -1497,8 +1479,6 @@ public class AvContentCfgService extends BaseService{
maatCfg.setDigestRegionList(digestRegionList);
maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setGroupNum(groupRelationList.size());
//TODO 后期修改
maatCfg.setUserRegion(entity.getCompileId()+"");
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(entity.getIsValid());
configCompileList.add(maatCfg);