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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
duandongmei
2018-11-02 11:22:00 +08:00
parent c69370aabe bb3fbdcd25
commit 2402aff648
17 changed files with 308 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -352,6 +352,35 @@ public class ExportExcel {
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
}
if("group".equals(headerStr)) {
commentStr="";
//查询ip复用地址池配置的policyGroup列表
List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByType(2);
if(!StringUtil.isEmpty(list)){
for (PolicyGroupInfo policyGroupInfo : list) {
commentStr=commentStr+policyGroupInfo.getGroupId()+"（"+policyGroupInfo.getGroupName()+"）\n";
index++;
}
}
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
}
if("isp".equals(headerStr)) {
commentStr="";
List<Integer> itTypeList = new ArrayList<Integer>();
itTypeList.add(Constants.ITEM_TYPE_ISP);
SysDictInfo sysDictInfo=new SysDictInfo();
sysDictInfo.setConditionType(itTypeList);
List<SysDictInfo> isps=sysDictInfoDao.findAllSysDictInfo(sysDictInfo,null);
if(!StringUtil.isEmpty(isps)){
for (SysDictInfo _sysDictInfo : isps) {
commentStr=commentStr+_sysDictInfo.getItemCode()+"（"+_sysDictInfo.getItemValue()+"）\n";
index++;
}
}
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
}
if(region.getRegionType().equals(1)){//IP配置
//ip配置需要导入的信息：srcIp srcPort destIp destPort Protocol Direction
//确定需要导入的srcIp srcPort destIp destPort信息