融合代码，提交本地

更新：辅助字典移动到basics目录下，
               修订数据类型条件查询无效bug，
               优化无条件分页查询代码，
               配置编码自增，用户不需手动输入（app强特征作用域功能待添加）；
               无上级，改为根节点，

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

@@ -23,6 +23,24 @@ public class AreaIpCfg extends BaseIpCfg {
 	 */
 	
 	private static final long serialVersionUID = 2367503808235405524L;
+	
+	/* (是否区域gk对此表无意义，直接设置0值)
+	 * @see com.nis.domain.configuration.BaseCfg#setIsAreaEffective(java.lang.Integer)
+	 */
+	@Override
+	public void setIsAreaEffective(Integer isAreaEffective) {
+		// TODO Auto-generated method stub
+		this.isAreaEffective=0;
+	}
+	
+	/* (区域生效id对此表无意义，直接设置null值)
+	 * @see com.nis.domain.configuration.BaseCfg#setAreaEffectiveIds(java.lang.String)
+	 */
+	@Override
+	public void setAreaEffectiveIds(String areaEffectiveIds) {
+		// TODO Auto-generated method stub
+		this.areaEffectiveIds=null;
+	}
 
 	/* (non-Javadoc)
 	 * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue()

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

@@ -10,6 +10,8 @@ package com.nis.domain.configuration;
 
 import java.util.Date;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 import com.nis.domain.BaseEntity;
 
 /**
@@ -21,6 +23,9 @@ import com.nis.domain.BaseEntity;
  */
 public class BaseCfg<T> extends BaseEntity<T> {
 	protected String tableName;
+	@Expose
+	@SerializedName("maatTable")
+	protected String maatTable;
 	/**
 	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
 	 *
@@ -519,5 +524,19 @@ public class BaseCfg<T> extends BaseEntity<T> {
 	public void setRequestName(String requestName) {
 		this.requestName = requestName;
 	}
+	/**
+	 * maatTable
+	 * @return  maatTable
+	*/
+	
+	public String getMaatTable() {
+		return maatTable;
+	}
+	/**
+	 * @param maatTable the maatTable to set
+	 */
+	public void setMaatTable(String maatTable) {
+		this.maatTable = maatTable;
+	}
 	
 }

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

@@ -8,6 +8,9 @@
  */
 package com.nis.domain.configuration;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
 /**
  * @ClassName: BaseIpConfig.java 
  * @Description: 基础IP配置
@@ -26,50 +29,74 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	/**
 	 * ip类型
 	 */
+	@Expose
+	@SerializedName("ipType")
 	protected Integer ipType;
 	/**
 	 * 源IP地址
 	 */
+	@Expose
+	@SerializedName("srcIp")
 	protected String srcIp ;
 	/**
 	 * 源地址掩码
 	 */
+	@Expose
+	@SerializedName("srcIpMask")
 	protected String srcIpMask ;
 	/**
 	 * 源端口
 	 */
+	@Expose
+	@SerializedName("srcPort")
 	protected String srcPort ;
 	/**
 	 * 源端口掩码
 	 */
+	@Expose
+	@SerializedName("srcPortMask")
 	protected String srcPortMask ;
 	/**
 	 * 目的IP地址
 	 */
+	@Expose
+	@SerializedName("dstIp")
 	protected String dstIp ;
 	/**
 	 * 目的地址掩码
 	 */
+	@Expose
+	@SerializedName("dstIpMask")
 	protected String dstIpMask ;
 	/**
 	 * 目的端口
 	 */
+	@Expose
+	@SerializedName("dstPort")
 	protected String dstPort ;
 	/**
 	 * 目的端口掩码
 	 */
+	@Expose
+	@SerializedName("dstPortMask")
 	protected String dstPortMask ;
 	/**
 	 * 方向
 	 */
+	@Expose
+	@SerializedName("direction")
 	protected Integer direction ;
 	/**
 	 * 方向
 	 */
+	@Expose
+	@SerializedName("protocol")
 	protected Integer protocol ;
 	/**
 	 * 协议ID
 	 */
+	@Expose
+	@SerializedName("protocolId")
 	protected Integer protocolId ;
 	/**
 	 * 编译id

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

@@ -8,6 +8,9 @@
  */
 package com.nis.domain.configuration;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
 /**
  * @ClassName: BaseStringConfig.java 
  * @Description: 基础字符串类配置
@@ -27,6 +30,8 @@ public class BaseStringCfg extends BaseCfg<BaseStringCfg> {
 	/**
 	 * 配置关键字
 	 */
+	@Expose
+	@SerializedName("keywords")
 	protected String cfgKeywords;
 	/**
 	 * cfgKeywords
@@ -49,14 +54,20 @@ public class BaseStringCfg extends BaseCfg<BaseStringCfg> {
 	/**
 	 * 表达式类型
 	 */
+	@Expose
+	@SerializedName("exprType")
 	protected Integer exprType ;
 	/**
 	 * 匹配方式
 	 */
+	@Expose
+	@SerializedName("matchMethod")
 	protected Integer matchMethod ;
 	/**
 	 * 是否hex二进制
 	 */
+	@Expose
+	@SerializedName("isHexbin")
 	protected Integer isHexbin;
 	
 	/**

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

@@ -8,6 +8,9 @@
  */
 package com.nis.domain.configuration;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
 /**
  * @ClassName: BaseEnhancedStringConfig.java 
  * @Description: 基础增强字符串类配置
@@ -27,10 +30,14 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
 	/**
 	 * 匹配区域
 	 */
+	@Expose
+	@SerializedName("district")
 	protected String district ;
 	/**
 	 * 关键字
 	 */
+	@Expose
+	@SerializedName("keywords")
 	protected String keywords;
 	/**
 	 * 编译id
@@ -39,14 +46,20 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
 	/**
 	 * 表达式类型
 	 */
+	@Expose
+	@SerializedName("exprType")
 	protected Integer exprType ;
 	/**
 	 * 匹配方式
 	 */
+	@Expose
+	@SerializedName("matchMethod")
 	protected Integer matchMethod ;
 	/**
 	 * 是否hex二进制
 	 */
+	@Expose
+	@SerializedName("isHexbin")
 	protected Integer isHexbin ;
 	/**
 	 * district

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

@@ -34,5 +34,13 @@ public class IpPortCfg extends BaseIpCfg {
 		super.initDefaultValue();
 		this.protocolId = 0;
 	}
+	/**
+	 * 此表固定写0
+	 */
+	@Override
+	public void setProtocolId(Integer protocolId) {
+		// TODO Auto-generated method stub
+		super.setProtocolId(0);
+	}
 	
 }

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

@@ -8,6 +8,9 @@
  */
 package com.nis.domain.configuration;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
 /**
  * @ClassName: NumBoundaryConfig.java 
  * @Description: TODO
@@ -27,23 +30,15 @@ public class NumBoundaryCfg extends BaseCfg<NumBoundaryCfg> {
 	/**
 	 * 数值下界
 	 */
+	@Expose
+	@SerializedName("lowBounadry")
 	protected Long lowBounadry;
 	/**
 	 * 数值上界
 	 */
+	@Expose
+	@SerializedName("upBoundary")
 	protected Long upBoundary;
-	/**
-	 * 数值上界
-	 */
-	protected Integer exprType ;
-	/**
-	 * 数值上界
-	 */
-	protected Integer matchMethod ;
-	/**
-	 * 数值上界
-	 */
-	protected Integer isHexbin ;
 	protected Long compileId;
 	/* (non-Javadoc)
 	 * @see com.nis.domain.configuration.BaseCfg#initDefaultValue()
@@ -52,9 +47,6 @@ public class NumBoundaryCfg extends BaseCfg<NumBoundaryCfg> {
 	public void initDefaultValue() {
 		// TODO Auto-generated method stub
 		super.initDefaultValue();
-		this.exprType = 3;
-		this.matchMethod = 0;
-		this.isHexbin = 0;
 	}
 	/**
 	 * lowBounadry
@@ -84,48 +76,6 @@ public class NumBoundaryCfg extends BaseCfg<NumBoundaryCfg> {
 	public void setUpBoundary(Long upBoundary) {
 		this.upBoundary = upBoundary;
 	}
-	/**
-	 * exprType
-	 * @return  exprType
-	*/
-	
-	public Integer getExprType() {
-		return exprType;
-	}
-	/**
-	 * @param exprType the exprType to set
-	 */
-	public void setExprType(Integer exprType) {
-		this.exprType = exprType;
-	}
-	/**
-	 * matchMethod
-	 * @return  matchMethod
-	*/
-	
-	public Integer getMatchMethod() {
-		return matchMethod;
-	}
-	/**
-	 * @param matchMethod the matchMethod to set
-	 */
-	public void setMatchMethod(Integer matchMethod) {
-		this.matchMethod = matchMethod;
-	}
-	/**
-	 * isHexbin
-	 * @return  isHexbin
-	*/
-	
-	public Integer getIsHexbin() {
-		return isHexbin;
-	}
-	/**
-	 * @param isHexbin the isHexbin to set
-	 */
-	public void setIsHexbin(Integer isHexbin) {
-		this.isHexbin = isHexbin;
-	}
 	/**
 	 * compileId
 	 * @return  compileId

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

@@ -1,11 +1,14 @@
 package com.nis.domain.configuration;
 
 import java.util.Date;
+import java.util.List;
 
 import com.nis.domain.BaseEntity;
 
 public class RequestInfo extends BaseEntity<RequestInfo>{
 	
+	private Long taskId;
+	
     private String requestNumber;
 
     private String requestOrg;
@@ -39,8 +42,18 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
     private Date beginDate;//开始时间
     private Date endDate;//结束时间
     private String timeType;//时间类型
+    private String taskName;//专项任务
     
-    public String getRequestNumber() {
+
+	public Long getTaskId() {
+		return taskId;
+	}
+
+	public void setTaskId(Long taskId) {
+		this.taskId = taskId;
+	}
+
+	public String getRequestNumber() {
         return requestNumber;
     }
 
@@ -191,5 +204,13 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
 	public void setTimeType(String timeType) {
 		this.timeType = timeType;
 	}
+
+	public String getTaskName() {
+		return taskName;
+	}
+
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
     
 }

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

@@ -0,0 +1,131 @@
+package com.nis.domain.configuration;
+
+import java.util.Date;
+
+import com.nis.domain.BaseEntity;
+
+public class TaskInfo extends BaseEntity<TaskInfo> {
+	private static final long serialVersionUID = 1L;
+
+	private String taskName;
+
+	private String taskOrg;
+
+	private Date taskTime;
+
+	private String taskDesc;
+
+	private Integer isValid;
+
+	private Integer isAudit;
+
+	private Integer creatorId;
+
+	private Date createTime;
+
+	private Integer editorId;
+
+	private Date editTime;
+
+	private Integer auditorId;
+
+	private Date auditTime;
+
+	public String getTaskName() {
+		return taskName;
+	}
+
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
+
+	public String getTaskOrg() {
+		return taskOrg;
+	}
+
+	public void setTaskOrg(String taskOrg) {
+		this.taskOrg = taskOrg;
+	}
+
+	public Date getTaskTime() {
+		return taskTime;
+	}
+
+	public void setTaskTime(Date taskTime) {
+		this.taskTime = taskTime;
+	}
+
+	public String getTaskDesc() {
+		return taskDesc;
+	}
+
+	public void setTaskDesc(String taskDesc) {
+		this.taskDesc = taskDesc;
+	}
+
+	public Integer getIsValid() {
+		return isValid;
+	}
+
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+
+	public Integer getIsAudit() {
+		return isAudit;
+	}
+
+	public void setIsAudit(Integer isAudit) {
+		this.isAudit = isAudit;
+	}
+
+	public Integer getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(Integer creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getEditorId() {
+		return editorId;
+	}
+
+	public void setEditorId(Integer editorId) {
+		this.editorId = editorId;
+	}
+
+	public Date getEditTime() {
+		return editTime;
+	}
+
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+
+	public Integer getAuditorId() {
+		return auditorId;
+	}
+
+	public void setAuditorId(Integer auditorId) {
+		this.auditorId = auditorId;
+	}
+
+	public Date getAuditTime() {
+		return auditTime;
+	}
+
+	public void setAuditTime(Date auditTime) {
+		this.auditTime = auditTime;
+	}
+
+	
+}