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

asn导出字段调整

Browse Source
This commit is contained in:
wangxin
2019-01-06 22:49:06 +08:00
parent ed0b618410
commit f05c9024b5
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/domain/basics/AsnIpCfg.java
View File

@@ -45,8 +45,6 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
private Integer protocol ; private Integer protocol ;
private Integer protocolId; private Integer protocolId;
@ExcelField(title="is_issued",dictType="VALID_IDENTIFIER",sort=90)
private String isIssued;
@ExcelField(title="organization",sort=91) @ExcelField(title="organization",sort=91)
private String organization; private String organization;
@ExcelField(title="country",sort=92) @ExcelField(title="country",sort=92)
@@ -80,12 +78,14 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
public void setDetail(String detail) { public void setDetail(String detail) {
this.detail = detail; this.detail = detail;
} }
public String getIsIssued() {
return isIssued; public Integer getIsValid() {
return isValid;
} }
public void setIsIssued(String isIssued) { public void setIsValid(Integer isValid) {
this.isIssued = isIssued; this.isValid = isValid;
} }
public Integer getProtocolId() { public Integer getProtocolId() {
return protocolId; return protocolId;
} }
@@ -180,7 +180,7 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
+ ipPattern + ", srcIpAddress=" + srcIpAddress + ", destIpAddress=" + destIpAddress + ", portPattern=" + ipPattern + ", srcIpAddress=" + srcIpAddress + ", destIpAddress=" + destIpAddress + ", portPattern="
+ portPattern + ", srcPort=" + srcPort + ", destPort=" + destPort + ", asnIpGroupName=" + asnIpGroupName + portPattern + ", srcPort=" + srcPort + ", destPort=" + destPort + ", asnIpGroupName=" + asnIpGroupName
+ ", asnIpGroup=" + asnIpGroup + ", direction=" + direction + ", protocol=" + protocol + ", protocolId=" + ", 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 + ", userRegion2=" + userRegion2 + ", userRegion3=" + userRegion3 + ", userRegion4=" + userRegion4
+ ", userRegion5=" + userRegion5 + ", cfgId=" + cfgId + ", cfgDesc=" + cfgDesc + ", action=" + action + ", userRegion5=" + userRegion5 + ", cfgId=" + cfgId + ", cfgDesc=" + cfgDesc + ", action=" + action
+ ", isValid=" + isValid + ", isAudit=" + isAudit + ", creatorId=" + creatorId + ", createTime=" + ", isValid=" + isValid + ", isAudit=" + isAudit + ", creatorId=" + creatorId + ", createTime="

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

@@ -226,12 +226,12 @@ public class AsnIpController extends BaseController{
Page<AsnIpCfg> page = asnIpCfgService.findPage(pageInfo, entity); Page<AsnIpCfg> page = asnIpCfgService.findPage(pageInfo, entity);
list=page.getList(); list=page.getList();
} }
for (AsnIpCfg asnIp : list) { // for (AsnIpCfg asnIp : list) {
asnIp.setIsIssued(String.valueOf(asnIp.getIsValid())); // asnIp.setIsIssued(String.valueOf(asnIp.getIsValid()));
} // }
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,valid_identifier,is_audit" String cfgIndexInfoNoExport=",block_type,do_log,action"
+ ",auditor,audit_time,letter,whether_area_block,classification,attribute,label" + ",auditor,audit_time,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-";
// 时间过滤 // 时间过滤