关键字处理

This commit is contained in:
leijun
2018-10-18 16:07:32 +08:00
parent 1179daeb78
commit 62eb9cf7fc

View File

@@ -236,18 +236,13 @@ public class InterceptController extends CommonController{
noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport); noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport);
noExportMap.put("PXY_INTERCEPT_PKT_BIN", interceptNoExport); noExportMap.put("PXY_INTERCEPT_PKT_BIN", interceptNoExport);
List<IpPortCfg> ipList=new ArrayList<IpPortCfg>(); List<IpPortCfg> ipList=new ArrayList<IpPortCfg>();
List<InterceptPktBin> interInfoList=new ArrayList<InterceptPktBin>(); List<BaseStringCfg> interInfoList=new ArrayList<BaseStringCfg>();
for (CfgIndexInfo cfg : page.getList()) { for (CfgIndexInfo cfg : page.getList()) {
CfgIndexInfo cfgIndexInfo=interceptCfgService.exportIpInfo(cfg); CfgIndexInfo cfgIndexInfo=interceptCfgService.exportIpInfo(cfg);
ipList.addAll(cfgIndexInfo.getIpPortList()); ipList.addAll(cfgIndexInfo.getIpPortList());
interInfoList.addAll(cfgIndexInfo.getInterceptPktBinList()); interInfoList.addAll(cfgIndexInfo.getInterceptPktBinList());
} }
if(interInfoList.size()>0){ interInfoList=replaceBaseList(interInfoList);
for (int i = 0; i < interInfoList.size(); i++) {
BaseStringCfg base=(BaseStringCfg)interInfoList.get(i);
base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," "));
}
}
dataMap.put(entity.getMenuNameCode(), page.getList()); dataMap.put(entity.getMenuNameCode(), page.getList());
dataMap.put("PXY_INTERCEPT_IP", ipList); dataMap.put("PXY_INTERCEPT_IP", ipList);
dataMap.put("PXY_INTERCEPT_PKT_BIN", interInfoList); dataMap.put("PXY_INTERCEPT_PKT_BIN", interInfoList);
@@ -260,4 +255,12 @@ public class InterceptController extends CommonController{
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }
public static List<BaseStringCfg> replaceBaseList(List<BaseStringCfg> list){
for (int i = 0; i < list.size(); i++) {
BaseStringCfg base=(BaseStringCfg)list.get(i);
base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," "));
}
return list;
}
} }