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

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();
+    }*/
+
+}