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

ip导出bug修正

Browse Source
This commit is contained in:
duandongmei
2018-10-17 11:08:54 +08:00
parent 263141ee5f
commit 2b1192df3e
1 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -275,7 +275,6 @@ public class IpController extends BaseController{
return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+5; return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+5;
} }
//ip配置导出 //ip配置导出
@RequestMapping(value = "exportIpAddr") @RequestMapping(value = "exportIpAddr")
public void exportIp(Model model,HttpServletRequest request,HttpServletResponse response, public void exportIp(Model model,HttpServletRequest request,HttpServletResponse response,
@@ -307,10 +306,10 @@ public class IpController extends BaseController{
} }
Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(pageInfo, entity); Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(pageInfo, entity);
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
titleList.add("ip_addr"); titleList.add("NTC_IP");
titleList.add("asn_policy"); titleList.add("asn_policy");
classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class);
classMap.put("ip_port_cfg", IpPortCfg.class); classMap.put("NTC_IP", IpPortCfg.class);
classMap.put("asn_policy", ConfigGroupInfo.class); classMap.put("asn_policy", ConfigGroupInfo.class);
String cfgIndexInfoNoExport=",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; String cfgIndexInfoNoExport=",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
@@ -319,7 +318,7 @@ public class IpController extends BaseController{
+",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,"; +",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,";
String asnGroupInfoNoExport=""; String asnGroupInfoNoExport="";
noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
noExportMap.put("ip_addr", ipPortInfoNoExport); noExportMap.put("NTC_IP", ipPortInfoNoExport);
noExportMap.put("asn_policy", asnGroupInfoNoExport); noExportMap.put("asn_policy", asnGroupInfoNoExport);
List<IpPortCfg> ipList=new ArrayList<IpPortCfg>(); List<IpPortCfg> ipList=new ArrayList<IpPortCfg>();
List<ConfigGroupInfo> groupInfoList=new ArrayList<ConfigGroupInfo>(); List<ConfigGroupInfo> groupInfoList=new ArrayList<ConfigGroupInfo>();
@@ -334,7 +333,7 @@ public class IpController extends BaseController{
} }
} }
dataMap.put(entity.getMenuNameCode(), page.getList()); dataMap.put(entity.getMenuNameCode(), page.getList());
dataMap.put("ip_addr", ipList); dataMap.put("NTC_IP", ipList);
dataMap.put("asn_policy", groupInfoList); dataMap.put("asn_policy", groupInfoList);
/*}*/ /*}*/