From 8ef35d837aa6c4607e7b386c401b66728e81cf24 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Wed, 31 Oct 2018 09:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E9=9D=9Ere?=
 =?UTF-8?q?gion=E5=AD=97=E5=85=B8=E7=B1=BB=E7=9A=84=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=EF=BC=8C=E5=8D=95=E4=B8=AA=E5=80=BC=E4=B9=9F=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=9B=20ip=E7=99=BD=E5=90=8D=E5=8D=95=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86=E8=B0=83=E7=94=A8=E7=99=BD?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/util/excel/ExportExcel.java  | 49 ++++++-------------
 .../configuration/ntc/IpController.java       |  6 +++
 2 files changed, 20 insertions(+), 35 deletions(-)

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<DnsResStrategy> 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<DnsResStrategy> 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<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{
 				List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2);