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

导入模板非region字典类的属性，单个值也展示；

Browse Source 
ip白名单导入特殊处理调用白名单模板
This commit is contained in:
duandongmei
2018-10-31 09:51:52 +08:00
parent ea6cbab3c8
commit 8ef35d837a
2 changed files with 20 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,14 +161,9 @@ public class ExportExcel {
} }
} }
} }
if(StringUtil.isEmpty(commentStr)){
headerStr="";
commentStr="";
}else{
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
} }
}
//p2p_ip_config_type //p2p_ip_config_type
if("p2p_ip_config_type".equals(headerStr)){ if("p2p_ip_config_type".equals(headerStr)){
commentStr=""; commentStr="";
@@ -184,14 +179,9 @@ public class ExportExcel {
} }
} }
} }
if(StringUtil.isEmpty(commentStr)){
headerStr="";
commentStr="";
}else{
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
} }
}
//ratelimit //ratelimit
if("ratelimit".equals(headerStr)){ if("ratelimit".equals(headerStr)){
commentStr=""; commentStr="";
@@ -207,14 +197,9 @@ public class ExportExcel {
} }
} }
} }
if(StringUtil.isEmpty(commentStr)){
headerStr="";
commentStr="";
}else{
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
} }
}
//replace_zone //replace_zone
if("replace_zone".equals(headerStr)){ if("replace_zone".equals(headerStr)){
commentStr=""; commentStr="";
@@ -230,14 +215,9 @@ public class ExportExcel {
} }
} }
} }
if(StringUtil.isEmpty(commentStr)){
headerStr="";
commentStr="";
}else{
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
} }
}
if("asn_no".equals(headerStr)){ if("asn_no".equals(headerStr)){
commentStr=msgProp.getProperty("input_integer")+":\n"+commentStr; commentStr=msgProp.getProperty("input_integer")+":\n"+commentStr;
@@ -245,22 +225,21 @@ public class ExportExcel {
} }
if("policy_name".equals(headerStr)){ if("policy_name".equals(headerStr)){
List<DnsResStrategy> resStrategys=dnsResStrategyDao.findList(null, 1,1);
if(StringUtil.isEmpty(resStrategys)){
headerStr="";
commentStr="";
}else{
if(service.getAction().equals(1)){ if(service.getAction().equals(1)){
headerStr=""; headerStr="";
commentStr=""; commentStr="";
}else{ }else{
List<DnsResStrategy> resStrategys=dnsResStrategyDao.findList(null, 1,1);
commentStr=commentStr+"0"+"（"+msgProp.getProperty("no_strategy")+"）\n";
index++;
if(!StringUtil.isEmpty(resStrategys)){
for (DnsResStrategy dnsResStrategy : resStrategys) { for (DnsResStrategy dnsResStrategy : resStrategys) {
commentStr=commentStr+dnsResStrategy.getCfgId()+"（"+dnsResStrategy.getCfgDesc()+"）\n"; commentStr=commentStr+dnsResStrategy.getCfgId()+"（"+dnsResStrategy.getCfgDesc()+"）\n";
index++; index++;
} }
} }
} }
if(StringUtil.isEmpty(commentStr)){ if(StringUtil.isEmpty(headerStr)){
headerStr=""; headerStr="";
commentStr=""; commentStr="";
}else{ }else{

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

@@ -35,6 +35,7 @@ import com.nis.domain.configuration.template.DnsIpTemplate;
import com.nis.domain.configuration.template.IpAllTemplate; import com.nis.domain.configuration.template.IpAllTemplate;
import com.nis.domain.configuration.template.IpPayloadTemplate; import com.nis.domain.configuration.template.IpPayloadTemplate;
import com.nis.domain.configuration.template.IpRateLimitTemplate; import com.nis.domain.configuration.template.IpRateLimitTemplate;
import com.nis.domain.configuration.template.IpWhitelistTemplate;
import com.nis.domain.configuration.template.P2pHashStringTemplate; import com.nis.domain.configuration.template.P2pHashStringTemplate;
import com.nis.domain.configuration.template.P2pIpTemplate; import com.nis.domain.configuration.template.P2pIpTemplate;
import com.nis.domain.configuration.template.StringAllTemplate; import com.nis.domain.configuration.template.StringAllTemplate;
@@ -276,6 +277,11 @@ public class IpController extends BaseController{
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, AsnIpTemplate.class, 2); ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, AsnIpTemplate.class, 2);
excel.setDataList(this.getMsgProp(),classList,null). excel.setDataList(this.getMsgProp(),classList,null).
write(request,response, fileName).dispose(); write(request,response, fileName).dispose();
}else if(regionDict.getFunctionId().equals(3)){ //ip whitelist
List<IpWhitelistTemplate> classList=new ArrayList<IpWhitelistTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpWhitelistTemplate.class, 2);
excel.setDataList(this.getMsgProp(),classList,null).
write(request,response, fileName).dispose();
}else{ }else{
List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>(); List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2); ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2);