From 44966707bef9ebecd5360ec7e8b9eb1e5bf266e6 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 8 Jan 2019 18:55:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DIP=20=E5=AF=BC=E5=87=BAASN?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8=EF=BC=8CASN=20IP?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=92=E9=99=A4=E5=88=97=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=91=98=E7=9A=84=E6=8E=92=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/controller/basics/AsnIpController.java | 6 +----- .../nis/web/controller/configuration/ntc/IpController.java | 7 ++++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nis/web/controller/basics/AsnIpController.java b/src/main/java/com/nis/web/controller/basics/AsnIpController.java index cdc630714..ae36a28f2 100644 --- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java +++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java @@ -11,7 +11,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -28,9 +27,6 @@ import com.nis.domain.Page; import com.nis.domain.basics.AsnGroupInfo; import com.nis.domain.basics.AsnIpCfg; import com.nis.domain.configuration.CfgIndexInfo; -import com.nis.domain.configuration.IpPortCfg; - -import com.nis.domain.specific.ConfigGroupInfo; import com.nis.exceptions.MaatConvertException; //import com.nis.util.AsnCacheUtils; import com.nis.util.Constants; @@ -232,7 +228,7 @@ public class AsnIpController extends BaseController{ titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), AsnIpCfg.class); String cfgIndexInfoNoExport=",block_type,do_log,action" - + ",auditor,audit_time,letter,whether_area_block,classification,attribute,label" + + ",letter,whether_area_block,classification,attribute,label" +",userregion2,userregion3,userregion4,userregion5,ir_type,group_name,&userregion1:asn_no-"; // 时间过滤 if (entity.getSearch_create_time_start() == null ) { 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 eee39eb59..a6a6a3dab 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 @@ -25,7 +25,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.FunctionRegionDict; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; -import com.nis.domain.basics.AsnGroupInfo; import com.nis.domain.configuration.AsnKeywordCfg; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.IpPortCfg; @@ -59,7 +58,6 @@ import com.nis.domain.configuration.template.P2pHashStringTemplate; import com.nis.domain.configuration.template.P2pIpTemplate; import com.nis.domain.configuration.template.SnatTemplate; import com.nis.domain.configuration.template.StringAllTemplate; -import com.nis.domain.specific.ConfigGroupInfo; import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -564,7 +562,10 @@ public class IpController extends BaseController{ for (CfgIndexInfo cfg : ipLists) { CfgIndexInfo cfgIndexInfo=ipCfgService.exportIpInfo(cfg); ipList.addAll(cfgIndexInfo.getIpPortList()); - groupInfoList.addAll(cfgIndexInfo.getAsnKeywords()); + if(cfgIndexInfo.getAsnKeywords()!=null) { + groupInfoList.addAll(cfgIndexInfo.getAsnKeywords()); + } + } dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put("NTC_IP", ipList);