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

50
src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
View File

@@ -112,6 +112,24 @@
html+="</label>"; html+="</label>";
html+="</div>"; html+="</div>";
html+="</div>"; html+="</div>";
html+="</div>";
html+="<div class='row'>";
html+="<div class='col-md-4'>";
html+="<div class='form-group'>";
html+="<label><spring:message code='whether_hexbinary'/>：</label>";
html+="<label>"
if(item.isHexbin==1){
html+="<spring:message code='hex_binary'/>"
}
if(item.isHexbin==2){
html+="<spring:message code='case_sensitive_nohex'/>"
}
if(item.isHexbin==0){
html+="<spring:message code='case_insensitive_nohex'/>"
}
html+="</label>";
html+="</div>";
html+="</div>";
html+="<div class='col-md-4'>"; html+="<div class='col-md-4'>";
html+="<div class='form-group'>"; html+="<div class='form-group'>";
html+="<label><spring:message code='expression_type'/>：</label>"; html+="<label><spring:message code='expression_type'/>：</label>";
@@ -145,38 +163,6 @@
html+="</div>"; html+="</div>";
html+="</div>"; html+="</div>";
html+="</div>"; html+="</div>";
html+="<div class='row'>";
html+="<div class='col-md-4'>";
html+="<div class='form-group'>";
html+="<label><spring:message code='whether_hexbinary'/>：</label>";
html+="<label>"
if(item.isHexbin==1){
html+="<spring:message code='hex_binary'/>"
}
if(item.isHexbin==2){
html+="<spring:message code='case_sensitive_nohex'/>"
}
if(item.isHexbin==0){
html+="<spring:message code='case_insensitive_nohex'/>"
}
html+="</label>";
html+="</div>";
html+="</div>";
html+="<div class='col-md-4'>";
html+="<div class='form-group'>";
html+="<label></label>";
html+="<label>"
html+="</label>";
html+="</div>";
html+="</div>";
html+="<div class='col-md-4'>";
html+="<div class='form-group'>";
html+="<label></label>";
html+="<label>"
html+="</label>";
html+="</div>";
html+="</div>";
html+="</div>";
/* if(index < (data.ip.length-1) && index != 0){ /* if(index < (data.ip.length-1) && index != 0){
alert("下一行"); alert("下一行");
} }

32
src/main/webapp/static/global/scripts/common.js
View File

@@ -11,6 +11,9 @@ $(function(){
$("select[name$='ipType']").each(function(){ $("select[name$='ipType']").each(function(){
switchIpInfo(this); switchIpInfo(this);
}) })
$("select[name$='exprType']").each(function(){
switchIpInfo(this);
})
$("select[name$='ipType']").on("change",function(){ $("select[name$='ipType']").on("change",function(){
switchIpInfo(this); switchIpInfo(this);
}); });
@@ -206,6 +209,9 @@ $(function(){
var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0]; var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
var isTags = $(this).hasClass("tags");//有tags样式的关键字输入框才需处理 var isTags = $(this).hasClass("tags");//有tags样式的关键字输入框才需处理
if(typeof(tagsId)!=='undefined' && tagsId.indexOf("tags_")!=-1 && isTags){ if(typeof(tagsId)!=='undefined' && tagsId.indexOf("tags_")!=-1 && isTags){
if($("input:radio[name='"+objNamePrefix+"exprType']").val()==1){
$("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").attr("disabled",true);
}
//表单中如果有关键字内容可能输入多个关键字的情况，根据输入关键字个数确定表达式选中情况，不允许手动选中 //表单中如果有关键字内容可能输入多个关键字的情况，根据输入关键字个数确定表达式选中情况，不允许手动选中
$("input:radio[name='"+objNamePrefix+"exprType']").attr("disabled",true); $("input:radio[name='"+objNamePrefix+"exprType']").attr("disabled",true);
tagsInputSettings = tagsInputSettings+",#"+tagsId; tagsInputSettings = tagsInputSettings+",#"+tagsId;
@@ -271,9 +277,27 @@ $(function(){
} }
}); });
$("input[name$='exprType']").on("change",function(){
setDefaultMatchMethod(this);
});
$("input[name$='exprType']:checked").each(function(){
setDefaultMatchMethod(this);
});
}); });
//与表达式时，只允许为子串匹配
var setDefaultMatchMethod=function (obj){
var exprType = $(obj).val();
if(exprType == 1){
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").find("option").removeAttr("selected");
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").find("option[value=0]").attr("selected","selected");
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").find("option[value!=0]").attr("disabled",true);
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").selectpicker("refresh");
}else{
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").find("option").removeAttr("disabled");
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").selectpicker("refresh");
}
}
var switchIpType=function(obj){ var switchIpType=function(obj){
var type=$(obj).val(); var type=$(obj).val();
var row=$(obj).parents('.row'); var row=$(obj).parents('.row');
@@ -650,8 +674,14 @@ function isLicit(str,regStr) {//判断是否为合格字符 //s 包括空格回
function exprTypeChecked(objNamePrefix,size){ function exprTypeChecked(objNamePrefix,size){
if(size>1) { if(size>1) {
$("input:radio[name='"+objNamePrefix+"exprType'][value=1]").prop("checked",true); //选中是 $("input:radio[name='"+objNamePrefix+"exprType'][value=1]").prop("checked",true); //选中是
$("select[name='"+objNamePrefix+"matchMethod']").find("option").removeAttr("selected",false);
$("select[name='"+objNamePrefix+"matchMethod']").find("option[value=0]").attr("selected",true);
$("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").attr("disabled",true);
$("select[name='"+objNamePrefix+"matchMethod']").selectpicker("refresh");
}else { }else {
$("input:radio[name='"+objNamePrefix+"exprType'][value=0]").prop("checked",true); //选中否 $("input:radio[name='"+objNamePrefix+"exprType'][value=0]").prop("checked",true); //选中否
$("select[name='"+objNamePrefix+"matchMethod']").find("option").removeAttr("disabled");
$("select[name='"+objNamePrefix+"matchMethod']").selectpicker("refresh");
} }
} }
function validateDataIsLicit(){ function validateDataIsLicit(){