修改contIp、picIp、contUrl、picUrl列表显示格式与值

增加ipPattern、portPattern、direction、protocol、ishexbin、matchMethod字典,其中itemDesc属性修改为国际化code属性
This commit is contained in:
duandongmei
2018-06-05 11:34:48 +08:00
parent 03a686f002
commit ca60449f5e
12 changed files with 130 additions and 93 deletions

View File

@@ -221,7 +221,7 @@ public class AvContentController extends BaseController {
initFormCondition(model,cfg);
}
model.addAttribute("_cfg", cfg);
return "/cfg/av/contIp/contIpForm";
return "/cfg/av/picIp/picIpForm";
}
//保存CONTIP信息

View File

@@ -1114,7 +1114,7 @@
protocol_id = #{protocolId,jdbcType=INTEGER},
</if>
<if test="direction != null" >
protocol_id = #{direction,jdbcType=INTEGER},
direction = #{direction,jdbcType=INTEGER},
</if>
<if test="destPort != null and destPort != ''" >
dest_port = #{destPort,jdbcType=VARCHAR},

View File

@@ -1191,7 +1191,7 @@ public class AvContentCfgService extends BaseService{
if(!StringUtil.isEmpty(list)){
//TODO DELETE后期删除
for (BaseStringCfg strCfg : list) {
strCfg.setCfgType("MM_AV_UR");
strCfg.setCfgType("MM_AV_URL");
}
Map<String,List> strMap = cfgConvert(strRegionList,list,2,entity,groupRelationList);
groupRelationList=strMap.get("groupList");