diff --git a/src/main/java/com/nis/domain/basics/AsnIpCfg.java b/src/main/java/com/nis/domain/basics/AsnIpCfg.java index bae482edc..9e6a2324b 100644 --- a/src/main/java/com/nis/domain/basics/AsnIpCfg.java +++ b/src/main/java/com/nis/domain/basics/AsnIpCfg.java @@ -45,8 +45,6 @@ public class AsnIpCfg extends BaseCfg { private Integer protocol ; private Integer protocolId; - @ExcelField(title="is_issued",dictType="VALID_IDENTIFIER",sort=90) - private String isIssued; @ExcelField(title="organization",sort=91) private String organization; @ExcelField(title="country",sort=92) @@ -80,12 +78,14 @@ public class AsnIpCfg extends BaseCfg { public void setDetail(String detail) { this.detail = detail; } - public String getIsIssued() { - return isIssued; + + public Integer getIsValid() { + return isValid; } - public void setIsIssued(String isIssued) { - this.isIssued = isIssued; + public void setIsValid(Integer isValid) { + this.isValid = isValid; } + public Integer getProtocolId() { return protocolId; } @@ -180,7 +180,7 @@ public class AsnIpCfg extends BaseCfg { + ipPattern + ", srcIpAddress=" + srcIpAddress + ", destIpAddress=" + destIpAddress + ", portPattern=" + portPattern + ", srcPort=" + srcPort + ", destPort=" + destPort + ", asnIpGroupName=" + asnIpGroupName + ", asnIpGroup=" + asnIpGroup + ", direction=" + direction + ", protocol=" + protocol + ", protocolId=" - + protocolId + ", compileId=" + compileId + ", isIssued=" + isIssued + ", userRegion1=" + userRegion1 + + protocolId + ", compileId=" + compileId + ", isValid=" + isValid + ", userRegion1=" + userRegion1 + ", userRegion2=" + userRegion2 + ", userRegion3=" + userRegion3 + ", userRegion4=" + userRegion4 + ", userRegion5=" + userRegion5 + ", cfgId=" + cfgId + ", cfgDesc=" + cfgDesc + ", action=" + action + ", isValid=" + isValid + ", isAudit=" + isAudit + ", creatorId=" + creatorId + ", createTime=" 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 25a42de54..cdc630714 100644 --- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java +++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java @@ -226,12 +226,12 @@ public class AsnIpController extends BaseController{ Page page = asnIpCfgService.findPage(pageInfo, entity); list=page.getList(); } - for (AsnIpCfg asnIp : list) { - asnIp.setIsIssued(String.valueOf(asnIp.getIsValid())); - } +// for (AsnIpCfg asnIp : list) { +// asnIp.setIsIssued(String.valueOf(asnIp.getIsValid())); +// } titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), AsnIpCfg.class); - String cfgIndexInfoNoExport=",block_type,do_log,action,valid_identifier,is_audit" + String cfgIndexInfoNoExport=",block_type,do_log,action" + ",auditor,audit_time,letter,whether_area_block,classification,attribute,label" +",userregion2,userregion3,userregion4,userregion5,ir_type,group_name,&userregion1:asn_no-"; // 时间过滤