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

修复IP 导出ASN空指针异常，ASN IP导出排除列取消审核员的排除

Browse Source
This commit is contained in:
wangxin
2019-01-08 18:55:56 +08:00
parent 1417456525
commit 44966707be
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/basics/AsnIpController.java
View File

@@ -11,7 +11,6 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute; 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.AsnGroupInfo;
import com.nis.domain.basics.AsnIpCfg; import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.configuration.CfgIndexInfo; 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.exceptions.MaatConvertException;
//import com.nis.util.AsnCacheUtils; //import com.nis.util.AsnCacheUtils;
import com.nis.util.Constants; import com.nis.util.Constants;
@@ -232,7 +228,7 @@ public class AsnIpController extends BaseController{
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), AsnIpCfg.class); classMap.put(entity.getMenuNameCode(), AsnIpCfg.class);
String cfgIndexInfoNoExport=",block_type,do_log,action" 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-"; +",userregion2,userregion3,userregion4,userregion5,ir_type,group_name,&userregion1:asn_no-";
// 时间过滤 // 时间过滤
if (entity.getSearch_create_time_start() == null ) { if (entity.getSearch_create_time_start() == null ) {

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

@@ -25,7 +25,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.FunctionRegionDict; import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict; import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.basics.AsnGroupInfo;
import com.nis.domain.configuration.AsnKeywordCfg; import com.nis.domain.configuration.AsnKeywordCfg;
import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.IpPortCfg; 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.P2pIpTemplate;
import com.nis.domain.configuration.template.SnatTemplate; import com.nis.domain.configuration.template.SnatTemplate;
import com.nis.domain.configuration.template.StringAllTemplate; import com.nis.domain.configuration.template.StringAllTemplate;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.DictUtils; import com.nis.util.DictUtils;
@@ -564,7 +562,10 @@ public class IpController extends BaseController{
for (CfgIndexInfo cfg : ipLists) { for (CfgIndexInfo cfg : ipLists) {
CfgIndexInfo cfgIndexInfo=ipCfgService.exportIpInfo(cfg); CfgIndexInfo cfgIndexInfo=ipCfgService.exportIpInfo(cfg);
ipList.addAll(cfgIndexInfo.getIpPortList()); ipList.addAll(cfgIndexInfo.getIpPortList());
groupInfoList.addAll(cfgIndexInfo.getAsnKeywords()); if(cfgIndexInfo.getAsnKeywords()!=null) {
groupInfoList.addAll(cfgIndexInfo.getAsnKeywords());
}
} }
dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put(entity.getMenuNameCode(), ipLists);
dataMap.put("NTC_IP", ipList); dataMap.put("NTC_IP", ipList);