diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index 434873f1d..8bae8aa6e 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -161,13 +161,8 @@ public class ExportExcel { } } } - if(StringUtil.isEmpty(commentStr)){ - headerStr=""; - commentStr=""; - }else{ - commentStr=msgProp.getProperty("select")+":\n"+commentStr; - index++; - } + commentStr=msgProp.getProperty("select")+":\n"+commentStr; + index++; } //p2p_ip_config_type if("p2p_ip_config_type".equals(headerStr)){ @@ -184,13 +179,8 @@ public class ExportExcel { } } } - if(StringUtil.isEmpty(commentStr)){ - headerStr=""; - commentStr=""; - }else{ - commentStr=msgProp.getProperty("select")+":\n"+commentStr; - index++; - } + commentStr=msgProp.getProperty("select")+":\n"+commentStr; + index++; } //ratelimit if("ratelimit".equals(headerStr)){ @@ -207,13 +197,8 @@ public class ExportExcel { } } } - if(StringUtil.isEmpty(commentStr)){ - headerStr=""; - commentStr=""; - }else{ - commentStr=msgProp.getProperty("select")+":\n"+commentStr; - index++; - } + commentStr=msgProp.getProperty("select")+":\n"+commentStr; + index++; } //replace_zone if("replace_zone".equals(headerStr)){ @@ -230,13 +215,8 @@ public class ExportExcel { } } } - if(StringUtil.isEmpty(commentStr)){ - headerStr=""; - commentStr=""; - }else{ - commentStr=msgProp.getProperty("select")+":\n"+commentStr; - index++; - } + commentStr=msgProp.getProperty("select")+":\n"+commentStr; + index++; } if("asn_no".equals(headerStr)){ @@ -245,22 +225,21 @@ public class ExportExcel { } if("policy_name".equals(headerStr)){ - List resStrategys=dnsResStrategyDao.findList(null, 1,1); - if(StringUtil.isEmpty(resStrategys)){ + if(service.getAction().equals(1)){ headerStr=""; commentStr=""; }else{ - if(service.getAction().equals(1)){ - headerStr=""; - commentStr=""; - }else{ + List resStrategys=dnsResStrategyDao.findList(null, 1,1); + commentStr=commentStr+"0"+"("+msgProp.getProperty("no_strategy")+")\n"; + index++; + if(!StringUtil.isEmpty(resStrategys)){ for (DnsResStrategy dnsResStrategy : resStrategys) { commentStr=commentStr+dnsResStrategy.getCfgId()+"("+dnsResStrategy.getCfgDesc()+")\n"; index++; } } } - if(StringUtil.isEmpty(commentStr)){ + if(StringUtil.isEmpty(headerStr)){ headerStr=""; commentStr=""; }else{ diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index 4de82248b..eee744f8b 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -35,6 +35,7 @@ import com.nis.domain.configuration.template.DnsIpTemplate; import com.nis.domain.configuration.template.IpAllTemplate; import com.nis.domain.configuration.template.IpPayloadTemplate; 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.P2pIpTemplate; 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); excel.setDataList(this.getMsgProp(),classList,null). write(request,response, fileName).dispose(); + }else if(regionDict.getFunctionId().equals(3)){ //ip whitelist + List classList=new ArrayList(); + ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpWhitelistTemplate.class, 2); + excel.setDataList(this.getMsgProp(),classList,null). + write(request,response, fileName).dispose(); }else{ List classList=new ArrayList(); ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2);