IP公共组配置部分功能提交

src/main/java/com/nis/domain/basics/CommonGroupInfo.java

@@ -0,0 +1,74 @@
+package com.nis.domain.basics;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * 公共分组实体
+ */
+public class CommonGroupInfo extends BaseCfg<CommonGroupInfo> implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7931466570918016654L;
+	
+	private Integer groupId;
+	
+	@ExcelField(title="group_name",sort=1)
+	private String groupName;
+	
+	@ExcelField(title="group_type",dictType="GROUP_TYPE",sort=2)
+	private Integer groupType;
+	
+	private Integer serviceGroupId;
+	
+	@ExcelField(title="desc",sort=4)
+	private String description;
+	
+	public Integer getServiceGroupId() {
+		return serviceGroupId;
+	}
+	public void setServiceGroupId(Integer serviceGroupId) {
+		this.serviceGroupId = serviceGroupId;
+	}
+	public Integer getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+	public String getGroupName() {
+		return groupName;
+	}
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	public Integer getGroupType() {
+		return groupType;
+	}
+	public void setGroupType(Integer groupType) {
+		this.groupType = groupType;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+}

src/main/java/com/nis/domain/basics/IpCommCfg.java

@@ -0,0 +1,315 @@
+package com.nis.domain.basics;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+public class IpCommCfg extends BaseCfg<IpCommCfg> {
+
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 4218856118489784060L;
+
+    /**
+     * 创建一个新的实例 BaseIpCfg.
+     *
+     */
+    public IpCommCfg() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+    private String indexTable="ip_comm_cfg";
+    /**
+     * ip类型
+     */
+    @Expose
+    @SerializedName("ipType")
+    @ExcelField(title="ip_type",dictType="IP_TYPE",sort=50)
+    protected Integer ipType;
+    @ExcelField(title="src_ip_pattern",dictType="IP_PATTERN",sort=51)
+    protected Integer srcIpPattern;
+    @ExcelField(title="client_ip",sort=52)
+    protected String srcIpAddress;
+    @ExcelField(title="dest_ip_pattern",dictType="IP_PATTERN",sort=53)
+    protected Integer destIpPattern;
+    @ExcelField(title="server_ip",sort=54)
+    protected String destIpAddress;
+    @ExcelField(title="src_port_pattern",dictType="PORT_PATTERN",sort=54)
+    protected Integer srcPortPattern;
+    @ExcelField(title="dest_port_pattern",dictType="PORT_PATTERN",sort=54)
+    protected Integer destPortPattern;
+    @ExcelField(title="client_port",sort=55)
+    protected String srcPort;
+    @ExcelField(title="server_port",sort=56)
+    protected String destPort;
+    protected Integer dnsStrategyId;
+    @ExcelField(title="ir_type",dictType="IR_TYPE",sort=57)
+    protected Integer irType;
+    @ExcelField(title="group_name",sort=58)
+    protected String groupName;
+    //	@ExcelField(title="log_total",sort=42)
+    private Long totalLogs;
+    private Integer regionId;
+    private Integer groupId;
+
+    public Integer getRegionId() {
+        return regionId;
+    }
+    public void setRegionId(Integer regionId) {
+        this.regionId = regionId;
+    }
+    public Integer getGroupId() {
+        return groupId;
+    }
+    public void setGroupId(Integer groupId) {
+        this.groupId = groupId;
+    }
+    public Long getTotalLogs() {
+        return totalLogs;
+    }
+    public void setTotalLogs(Long totalLogs) {
+        this.totalLogs = totalLogs;
+    }
+    /**
+     * irType
+     * @return  irType
+     */
+
+    public Integer getIrType() {
+        return irType;
+    }
+    /**
+     * @param irType the irType to set
+     */
+    public void setIrType(Integer irType) {
+        this.irType = irType;
+    }
+    /**
+     * groupName
+     * @return  groupName
+     */
+
+    public String getGroupName() {
+        return groupName;
+    }
+    /**
+     * @param groupName the groupName to set
+     */
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+    /**
+     * 方向
+     */
+    @Expose
+    @SerializedName("direction")
+    @ExcelField(title="direction",dictType="DIRECTION",sort=58)
+    protected Integer direction ;
+    /**
+     * 协议
+     */
+    @Expose
+    @SerializedName("protocol")
+    @ExcelField(title="protocol",dictType="PROTOCOL",sort=59)
+    protected Integer protocol ;
+    /**
+     * 协议ID
+     */
+    @Expose
+    @SerializedName("protocolId")
+    protected Integer protocolId ;
+    /**
+     * 限速比例
+     */
+    protected String ratelimit ;
+
+    /**
+     * ratelimit
+     * @return  ratelimit
+     */
+
+    public String getRatelimit() {
+        return ratelimit;
+    }
+    /**
+     * @param ratelimit the ratelimit to set
+     */
+    public void setRatelimit(String ratelimit) {
+        this.ratelimit = ratelimit;
+    }
+    /**
+     * ipType
+     * @return  ipType
+     */
+
+    public Integer getIpType() {
+        return ipType;
+    }
+    /**
+     * @param ipType the ipType to set
+     */
+    public void setIpType(Integer ipType) {
+        this.ipType = ipType;
+    }
+
+    /**
+     * direction
+     * @return  direction
+     */
+
+    public Integer getDirection() {
+        return direction;
+    }
+    /**
+     * @param direction the direction to set
+     */
+    public void setDirection(Integer direction) {
+        this.direction = direction;
+    }
+    /**
+     * protocol
+     * @return  protocol
+     */
+
+    public Integer getProtocol() {
+        return protocol;
+    }
+    /**
+     * @param protocol the protocol to set
+     */
+    public void setProtocol(Integer protocol) {
+        this.protocol = protocol;
+    }
+    /**
+     * protocolId
+     * @return  protocolId
+     */
+
+    public Integer getProtocolId() {
+        return protocolId;
+    }
+    /**
+     * @param protocolId the protocolId to set
+     */
+    public void setProtocolId(Integer protocolId) {
+        this.protocolId = protocolId;
+    }
+
+
+    public Integer getSrcIpPattern() {
+        return srcIpPattern;
+    }
+    public void setSrcIpPattern(Integer srcIpPattern) {
+        this.srcIpPattern = srcIpPattern;
+    }
+    public Integer getDestIpPattern() {
+        return destIpPattern;
+    }
+    public void setDestIpPattern(Integer destIpPattern) {
+        this.destIpPattern = destIpPattern;
+    }
+    public Integer getSrcPortPattern() {
+        return srcPortPattern;
+    }
+    public void setSrcPortPattern(Integer srcPortPattern) {
+        this.srcPortPattern = srcPortPattern;
+    }
+    public Integer getDestPortPattern() {
+        return destPortPattern;
+    }
+    public void setDestPortPattern(Integer destPortPattern) {
+        this.destPortPattern = destPortPattern;
+    }
+    /**
+     * srcIpAddress
+     * @return  srcIpAddress
+     */
+
+    public String getSrcIpAddress() {
+        return srcIpAddress;
+    }
+    /**
+     * @param srcIpAddress the srcIpAddress to set
+     */
+    public void setSrcIpAddress(String srcIpAddress) {
+        this.srcIpAddress = srcIpAddress;
+    }
+    /**
+     * destIpAddress
+     * @return  destIpAddress
+     */
+
+    public String getDestIpAddress() {
+        return destIpAddress;
+    }
+    /**
+     * @param destIpAddress the destIpAddress to set
+     */
+    public void setDestIpAddress(String destIpAddress) {
+        this.destIpAddress = destIpAddress;
+    }
+    /**
+     * srcPort
+     * @return  srcPort
+     */
+
+    public String getSrcPort() {
+        return srcPort;
+    }
+    /**
+     * @param srcPort the srcPort to set
+     */
+    public void setSrcPort(String srcPort) {
+        this.srcPort = srcPort;
+    }
+    /**
+     * destPort
+     * @return  destPort
+     */
+
+    public String getDestPort() {
+        return destPort;
+    }
+    /**
+     * @param destPort the destPort to set
+     */
+    public void setDestPort(String destPort) {
+        this.destPort = destPort;
+    }
+
+    /**
+     * dnsStrategyId
+     * @return  dnsStrategyId
+     */
+
+    public Integer getDnsStrategyId() {
+        return dnsStrategyId;
+    }
+    /**
+     * @param dnsStrategyId the dnsStrategyId to set
+     */
+    public void setDnsStrategyId(Integer dnsStrategyId) {
+        this.dnsStrategyId = dnsStrategyId;
+    }
+    @Override
+    public void initDefaultValue(){
+        super.initDefaultValue();
+        this.direction = 0;
+    }
+
+    public String getIndexTable() {
+        return indexTable;
+    }
+    public void setIndexTable(String indexTable) {
+        this.indexTable = indexTable;
+    }
+    public Integer getIndex() {
+        return index;
+    }
+    public void setIndex(Integer index) {
+        this.index = index;
+    }
+}

src/main/java/com/nis/domain/configuration/BaseCfg.java

@@ -78,6 +78,14 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	protected ScheduleCfg schedule;
 	
 	private String commonGroupIds; //公共组织id(考虑一个compile存在多个asn组织的情况)
+	protected Integer groupType; //url组以及dns组相关功能使用
+	protected Integer udFlag; //url组以及dns组相关功能使用 过滤数据库数据标记
+	public Integer getGroupType() {
+		return groupType;
+	}
+	public void setGroupType(Integer groupType) {
+		this.groupType = groupType;
+	}
 	public String getCommonGroupIds() {
 		return commonGroupIds;
 	}
@@ -85,8 +93,12 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	public void setCommonGroupIds(String commonGroupIds) {
 		this.commonGroupIds = commonGroupIds;
 	}
-	
-	
+	public Integer getUdFlag() {
+		return udFlag;
+	}
+	public void setUdFlag(Integer udFlag) {
+		this.udFlag = udFlag;
+	}
 	
 	public String getExType() {
 		return exType;

src/main/java/com/nis/domain/configuration/CfgIndexInfo.java

@@ -14,7 +14,9 @@ import java.util.Map;
 import com.google.gson.annotations.Expose;
 import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
+import com.nis.domain.basics.IpCommCfg;
 import com.nis.domain.basics.IpReuseIpCfg;
+import com.nis.domain.basics.UrlCommCfg;
 import com.nis.util.Constants;
 import com.nis.util.excel.ExcelField;
 
@@ -88,8 +90,8 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private List<AsnKeywordCfg> asnKeywords;
 	@ExcelField(title="log_total",sort=42)
 	private Long totalLogs;
-
-
+	private List<UrlCommCfg> urlCommGroupList;
+	private List<IpCommCfg> ipCommGroupCfgList;
 	/*private CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数
 	
 	public static class CachePolicyUserRegion{
@@ -101,6 +103,12 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	public String getOrganization() {
 		return organization;
 	}
+	public List<IpCommCfg> getIpCommGroupCfgList() {
+		return ipCommGroupCfgList;
+	}
+	public void setIpCommGroupCfgList(List<IpCommCfg> ipCommGroupCfgList) {
+		this.ipCommGroupCfgList = ipCommGroupCfgList;
+	}
 	public List<AsnKeywordCfg> getAsnKeywords() {
 		return asnKeywords;
 	}
@@ -411,4 +419,11 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	public void setTotalLogs(Long totalLogs) {
 		this.totalLogs = totalLogs;
 	}
+	public List<UrlCommCfg> getUrlCommGroupList() {
+		return urlCommGroupList;
+	}
+	public void setUrlCommGroupList(List<UrlCommCfg> urlCommGroupList) {
+		this.urlCommGroupList = urlCommGroupList;
+	}
+
 }

src/main/java/com/nis/domain/configuration/template/IpCommCfgTemplate.java

@@ -0,0 +1,47 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+public class IpCommCfgTemplate extends IpAllTemplate{
+    @ExcelField(title="ip_group",align=2,sort=10)
+    private Integer groupId;
+
+    public Integer getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Integer groupId) {
+        this.groupId = groupId;
+    }
+
+   /* @Override
+    public String getSrcIpAddress() {
+        // TODO Auto-generated method stub
+        return super.getSrcIpAddress();
+    }
+
+    @Override
+    public String getSrcPort() {
+        // TODO Auto-generated method stub
+        return super.getSrcPort();
+    }
+
+    @Override
+    public String getDestPort() {
+        // TODO Auto-generated method stub
+        return super.getDestPort();
+    }
+
+    @Override
+    public Integer getProtocol() {
+        // TODO Auto-generated method stub
+        return super.getProtocol();
+    }
+
+    @Override
+    public Integer getDirection() {
+        // TODO Auto-generated method stub
+        return super.getDirection();
+    }*/
+
+}