HTTP配置审核界面配置转maat配置处理逻辑提交

This commit is contained in:
zhangwei
2018-05-29 12:48:27 +08:00
parent 9064b553fd
commit 3f9f9f3088
9 changed files with 375 additions and 40 deletions

View File

@@ -8,6 +8,8 @@
*/
package com.nis.domain.configuration;
import com.nis.util.Constants;
/**
* @ClassName: AreaIpCfg.java
* @Description: TODO
@@ -54,6 +56,14 @@ public class AreaIpCfg extends BaseIpCfg {
this.protocolId=0;
this.isAreaEffective=0;
this.areaEffectiveIds=null;
this.cfgType=Constants.AREA_REGION;
this.cfgRegionCode=1;
this.protocol=0;
this.portPattern=1;
this.srcPort="0";
this.destPort="0";
this.direction=0;
this.destIpAddress="0.0.0.0";
}
/**

View File

@@ -18,6 +18,7 @@ import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.NumBoundaryCfg;
import com.nis.util.DateUtils;
/**
* @ClassName: MaatCfg.java
@@ -72,7 +73,7 @@ public class MaatCfg implements Serializable {
@Expose
private Integer fatherCfgId;
@Expose
@SerializedName("opTime")
@SerializedName("auditTime")
private Date auditTime;
@Expose
private List<GroupCfg> groupRelationList;
@@ -84,6 +85,9 @@ public class MaatCfg implements Serializable {
private List<NumBoundaryCfg> numRegionList;
@Expose
private List<DigestCfg> digestRegionList;
@Expose
@SerializedName("ipClientRangeList ")
private List<IpCfg> areaIpRegionList;
public static class GroupCfg{
@Expose
@@ -93,7 +97,7 @@ public class MaatCfg implements Serializable {
@Expose
private Integer isValid;
@Expose
private Date opTime;
private Date auditTime;
public Integer getGroupId() {
return groupId;
}
@@ -112,11 +116,11 @@ public class MaatCfg implements Serializable {
public void setIsValid(Integer isValid) {
this.isValid = isValid;
}
public Date getOpTime() {
return opTime;
public Date getAuditTime() {
return auditTime;
}
public void setOpTime(Date opTime) {
this.opTime = opTime;
public void setAuditTime(Date auditTime) {
this.auditTime = auditTime;
}
}
@@ -142,7 +146,7 @@ public class MaatCfg implements Serializable {
@Expose
private Integer isValid;
@Expose
private Date opTime;
private Date auditTime;
public Integer getRegionId() {
return regionId;
}
@@ -197,11 +201,11 @@ public class MaatCfg implements Serializable {
public void setIsValid(Integer isValid) {
this.isValid = isValid;
}
public Date getOpTime() {
return opTime;
public Date getAuditTime() {
return auditTime;
}
public void setOpTime(Date opTime) {
this.opTime = opTime;
public void setAuditTime(Date auditTime) {
this.auditTime = auditTime;
}
}
@@ -214,22 +218,27 @@ public class MaatCfg implements Serializable {
@SerializedName("tableName")
private String cfgType;
@Expose
@SerializedName("addrType")
private Integer ipType;
@Expose
private String srcIp;
@Expose
@SerializedName("maskSrcIp")
private String srcIpMask ;
@Expose
private String srcPort ;
@Expose
@SerializedName("maskSrcPort")
private String srcPortMask ;
@Expose
private String dstIp ;
@Expose
@SerializedName("maskDstIp")
private String dstIpMask ;
@Expose
private String dstPort ;
@Expose
@SerializedName("maskDstPort")
private String dstPortMask ;
@Expose
private Integer direction ;
@@ -238,7 +247,7 @@ public class MaatCfg implements Serializable {
@Expose
private Integer isValid;
@Expose
private Date opTime;
private Date auditTime;
public Integer getRegionId() {
return regionId;
}
@@ -329,11 +338,11 @@ public class MaatCfg implements Serializable {
public void setIsValid(Integer isValid) {
this.isValid = isValid;
}
public Date getOpTime() {
return opTime;
public Date getAuditTime() {
return auditTime;
}
public void setOpTime(Date opTime) {
this.opTime = opTime;
public void setAuditTime(Date auditTime) {
this.auditTime = auditTime;
}
}
public static class NumBoundaryCfg{
@@ -351,7 +360,7 @@ public class MaatCfg implements Serializable {
@Expose
private Integer isValid;
@Expose
private Date opTime;
private Date auditTime;
public Integer getRegionId() {
return regionId;
}
@@ -388,11 +397,11 @@ public class MaatCfg implements Serializable {
public void setIsValid(Integer isValid) {
this.isValid = isValid;
}
public Date getOpTime() {
return opTime;
public Date getAuditTime() {
return auditTime;
}
public void setOpTime(Date opTime) {
this.opTime = opTime;
public void setAuditTime(Date auditTime) {
this.auditTime = auditTime;
}
}public static class DigestCfg{
@Expose
@@ -411,7 +420,7 @@ public class MaatCfg implements Serializable {
@Expose
private Integer isValid;
@Expose
private Date opTime;
private Date auditTime;
public Integer getRegionId() {
return regionId;
}
@@ -454,11 +463,11 @@ public class MaatCfg implements Serializable {
public void setIsValid(Integer isValid) {
this.isValid = isValid;
}
public Date getOpTime() {
return opTime;
public Date getAuditTime() {
return auditTime;
}
public void setOpTime(Date opTime) {
this.opTime = opTime;
public void setAuditTime(Date auditTime) {
this.auditTime = auditTime;
}
}
public Integer getCompileId() {
@@ -611,4 +620,20 @@ public class MaatCfg implements Serializable {
public void setDigestRegionList(List<DigestCfg> digestRegionList) {
this.digestRegionList = digestRegionList;
}
public List<IpCfg> getAreaIpRegionList() {
return areaIpRegionList;
}
public void setAreaIpRegionList(List<IpCfg> areaIpRegionList) {
this.areaIpRegionList = areaIpRegionList;
}
public void initDefaultValue() {
this.doLog=2;
this.doBlackList=1;
this.configPercent=100;
this.configOption=1;
this.startTime=new Date();
this.endTime=DateUtils.addYears(new Date(), 81);
this.fatherCfgId=0;
}
}