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

修改contUrl和picUrl业务的keywords支持多个关键词

Browse Source 
common.js中tagInput相关的name属性取值将.去掉
暂时修改音视频类配置下发是的cfgType为maat对应的tableName
This commit is contained in:
duandongmei
2018-06-04 15:36:00 +08:00
parent d640e81439
commit 2e7312cdeb
8 changed files with 412 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package com.nis.web.service.configuration;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -351,12 +352,20 @@ public class AvContentCfgService extends BaseService{
if(isAudit==1){
if(!StringUtil.isEmpty(voipIpList)){
//TODO DELETE后期删除
for (AvVoipIpCfg ipCfg : voipIpList) {
ipCfg.setCfgType("MM_VOIP_IP");
}
Map<String,List> ipMap = cfgConvert(ipRegionList,voipIpList,1,entity,groupRelationList);
groupRelationList=ipMap.get("groupList");
ipRegionList=ipMap.get("dstList");
}
if(!StringUtil.isEmpty(voipAccountList)){
//TODO DELETE后期删除
for (AvVoipAccountCfg accountCfg : voipAccountList) {
accountCfg.setCfgType("MM_VOIP_ACCOUNT");
}
Map<String,List> accountMap = cfgConvert(strRegionList,voipAccountList,2,entity,groupRelationList);
groupRelationList=accountMap.get("groupList");
strRegionList=accountMap.get("dstList");
@@ -380,6 +389,8 @@ 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);
@@ -639,6 +650,10 @@ public class AvContentCfgService extends BaseService{
if(isAudit==1){
if(!StringUtil.isEmpty(list)){
//TODO DELETE后期删除
for (BaseIpCfg ipCfg : list) {
ipCfg.setCfgType("MM_AV_IP");
}
Map<String,List> ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList);
groupRelationList=ipMap.get("groupList");
ipRegionList=ipMap.get("dstList");
@@ -663,6 +678,8 @@ 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);
@@ -880,7 +897,7 @@ public class AvContentCfgService extends BaseService{
entity.setCfgId(Long.parseLong(id));
entity = avContentCfgDao.findIpCfgById(entity);
entity.setTableName("av_cont_ip_cfg");
entity.setTableName("av_pic_ip_cfg");
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
@@ -919,6 +936,11 @@ public class AvContentCfgService extends BaseService{
if(isAudit==1){
if(!StringUtil.isEmpty(list)){
//TODO DELETE后期删除
for (BaseIpCfg ipCfg : list) {
ipCfg.setCfgType("MM_PIC_IP");
}
Map<String,List> ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList);
groupRelationList=ipMap.get("groupList");
ipRegionList=ipMap.get("dstList");
@@ -943,6 +965,8 @@ 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);
@@ -1165,6 +1189,10 @@ public class AvContentCfgService extends BaseService{
if(isAudit==1){
if(!StringUtil.isEmpty(list)){
//TODO DELETE后期删除
for (BaseStringCfg strCfg : list) {
strCfg.setCfgType("MM_AV_UR");
}
Map<String,List> strMap = cfgConvert(strRegionList,list,2,entity,groupRelationList);
groupRelationList=strMap.get("groupList");
strRegionList=strMap.get("dstList");
@@ -1189,6 +1217,8 @@ 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);
@@ -1410,6 +1440,10 @@ public class AvContentCfgService extends BaseService{
if(isAudit==1){
if(!StringUtil.isEmpty(list)){
//TODO DELETE后期删除
for (BaseStringCfg strCfg : list) {
strCfg.setCfgType("MM_PIC_URL");
}
Map<String,List> strMap = cfgConvert(strRegionList,list,2,entity,groupRelationList);
groupRelationList=strMap.get("groupList");
strRegionList=strMap.get("dstList");
@@ -1434,6 +1468,8 @@ 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);