Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

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

@@ -32,11 +32,6 @@ public class AppIdCfg extends BaseCfg<AppIdCfg> {
 	 */
 	private String appId;
 	
-	/**
-	 * 编译id
-	 */
-	private Integer compileId;
-
 	/**
 	 * appName
 	 * @return  appName
@@ -69,22 +64,6 @@ public class AppIdCfg extends BaseCfg<AppIdCfg> {
 		this.appId = appId;
 	}
 
-	/**
-	 * compileId
-	 * @return  compileId
-	*/
-	
-	public Integer getCompileId() {
-		return compileId;
-	}
-
-	/**
-	 * @param compileId the compileId to set
-	 */
-	public void setCompileId(Integer compileId) {
-		this.compileId = compileId;
-	}
-
 	/* (non-Javadoc)
 	 * @see com.nis.domain.configuration.BaseCfg#initDefaultValue()
 	 */

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

@@ -22,7 +22,12 @@ import com.nis.domain.BaseEntity;
  * @version V1.0
  */
 public class BaseCfg<T> extends BaseEntity<T> {
+	protected String seltype;//选中类型,页面搜索用
 	protected String tableName;
+	/**
+	 * 编译id
+	 */
+	protected Integer compileId ;
 	@Expose
 	@SerializedName("maatTable")
 	protected String maatTable;
@@ -630,6 +635,33 @@ public class BaseCfg<T> extends BaseEntity<T> {
 	public void setSearch_audit_time_end(Date search_audit_time_end) {
 		this.search_audit_time_end = search_audit_time_end;
 	}
+	/**
+	 * seltype
+	 * @return  seltype
+	*/
 	
+	public String getSeltype() {
+		return seltype;
+	}
+	/**
+	 * @param seltype the seltype to set
+	 */
+	public void setSeltype(String seltype) {
+		this.seltype = seltype;
+	}
+	/**
+	 * compileId
+	 * @return  compileId
+	*/
+	
+	public Integer getCompileId() {
+		return compileId;
+	}
+	/**
+	 * @param compileId the compileId to set
+	 */
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
 	
 }

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

@@ -98,10 +98,6 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	@Expose
 	@SerializedName("protocolId")
 	protected Integer protocolId ;
-	/**
-	 * 编译id
-	 */
-	protected Long compileId ;
 	/**
 	 * ipType
 	 * @return  ipType
@@ -270,20 +266,6 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	public void setProtocolId(Integer protocolId) {
 		this.protocolId = protocolId;
 	}
-	/**
-	 * compileId
-	 * @return  compileId
-	*/
-	
-	public Long getCompileId() {
-		return compileId;
-	}
-	/**
-	 * @param compileId the compileId to set
-	 */
-	public void setCompileId(Long compileId) {
-		this.compileId = compileId;
-	}
 	@Override
 	public void initDefaultValue(){
 		super.initDefaultValue();

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

@@ -47,10 +47,6 @@ public class BaseStringCfg extends BaseCfg<BaseStringCfg> {
 	public void setCfgKeywords(String cfgKeywords) {
 		this.cfgKeywords = cfgKeywords;
 	}
-	/**
-	 * 编译id
-	 */
-	protected Long compileId ;
 	/**
 	 * 表达式类型
 	 */
@@ -120,19 +116,5 @@ public class BaseStringCfg extends BaseCfg<BaseStringCfg> {
 		super.initDefaultValue();
 		this.isHexbin = 0;
 	}
-	/**
-	 * compile_id
-	 * @return  compile_id
-	*/
-	
-	public Long getCompileId() {
-		return compileId;
-	}
-	/**
-	 * @param compile_id the compile_id to set
-	 */
-	public void setCompileId(Long compileId) {
-		this.compileId = compileId;
-	}
 	
 }

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

@@ -19,7 +19,6 @@ import com.google.gson.annotations.SerializedName;
  * @version V1.0
  */
 public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
-	protected String tableName;
 	/**
 	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
 	 *
@@ -33,16 +32,14 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
 	@Expose
 	@SerializedName("district")
 	protected String district ;
+	protected String districtShowName;
 	/**
 	 * 关键字
 	 */
 	@Expose
 	@SerializedName("keywords")
 	protected String keywords;
-	/**
-	 * 编译id
-	 */
-	protected Long compileId;
+	protected String keywordsShowName;
 	/**
 	 * 表达式类型
 	 */
@@ -89,20 +86,6 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
 	public void setKeywords(String keywords) {
 		this.keywords = keywords;
 	}
-	/**
-	 * compileId
-	 * @return  compileId
-	*/
-	
-	public Long getCompileId() {
-		return compileId;
-	}
-	/**
-	 * @param compileId the compileId to set
-	 */
-	public void setCompileId(Long compileId) {
-		this.compileId = compileId;
-	}
 	/**
 	 * exprType
 	 * 继承此类的类会覆盖该方法写自己的缺省值
@@ -158,19 +141,4 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
 		this.isHexbin = 0 ;
 		this.matchMethod=3;
 	}
-	/**
-	 * tableName
-	 * @return  tableName
-	*/
-	
-	public String getTableName() {
-		return tableName;
-	}
-	/**
-	 * @param tableName the tableName to set
-	 */
-	public void setTableName(String tableName) {
-		this.tableName = tableName;
-	} 
-	
 }

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

@@ -10,6 +10,7 @@ package com.nis.domain.configuration;
 
 import java.util.Date;
 
+import com.google.gson.annotations.Expose;
 import com.nis.domain.BaseEntity;
 import com.nis.domain.SysUser;
 
@@ -25,6 +26,7 @@ public class DnsIpCfg extends BaseEntity<DnsIpCfg> {
 	/**
 	 * 配置ID
 	 */
+	@Expose
 	private Long cfgId;
 	/**
 	 * 配置描述
@@ -33,46 +35,57 @@ public class DnsIpCfg extends BaseEntity<DnsIpCfg> {
 	/**
 	 * ip类型
 	 */
+	@Expose
 	private Integer ipType;
 	/**
 	 * 源IP地址
 	 */
+	@Expose
 	private String srcIp;
 	/**
 	 * 源地址掩码
 	 */
+	@Expose
 	private String srcIpMask ;
 	/**
 	 * 源端口
 	 */
+	@Expose
 	private String srcPort ;
 	/**
 	 * 源端口掩码
 	 */
+	@Expose
 	private String srcPortMask ;
 	/**
 	 * 目的IP地址
 	 */
+	@Expose
 	private String dstIp ;
 	/**
 	 * 目的地址掩码
 	 */
+	@Expose
 	private String dstIpMask ;
 	/**
 	 * 目的端口
 	 */
+	@Expose
 	private String dstPort ;
 	/**
 	 * 目的端口掩码
 	 */
+	@Expose
 	private String dstPortMask ;
 	/**
 	 * 方向
 	 */
+	@Expose
 	private Integer direction ;
 	/**
 	 * 方向
 	 */
+	@Expose
 	private Integer protocol ;
 	/**
 	 * 有效标识

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

@@ -0,0 +1,156 @@
+/**
+ *@Title: MultipleCfg.java
+ *@Package com.nis.domain.configuration 
+ *@Description TODO
+ *@author dell
+ *@date 2018年3月13日 上午8:59:32
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: MultipleCfg.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年3月13日 上午8:59:32
+ * @version V1.0
+ */
+public class MultipleCfg extends BaseCfg<MultipleCfg> {
+
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private static final long serialVersionUID = -8369567908781421920L;
+	private String mainTable;
+	private String mainTableType;
+	private List<TableBean> otherTables;//key 表名，value 类型 
+//	private BaseCfg mainCfg;
+	//ip配置
+	private Map<String,BaseIpCfg> ipCfg;
+	//字符串配置
+	private Map<String,BaseStringCfg> stringCfg;
+	//数值类配置
+	private Map<String,NumBoundaryCfg> numCfg;
+	//增强字符串配置
+	private Map<String,ComplexkeywordCfg> complexCfg;
+	//地域配置
+	private AreaIpCfg areaIpCfg;
+	/**
+	 * mainTable
+	 * @return  mainTable
+	*/
+	
+	public String getMainTable() {
+		return mainTable;
+	}
+	/**
+	 * @param mainTable the mainTable to set
+	 */
+	public void setMainTable(String mainTable) {
+		this.mainTable = mainTable;
+	}
+	/**
+	 * areaIpCfg
+	 * @return  areaIpCfg
+	*/
+	
+	public AreaIpCfg getAreaIpCfg() {
+		return areaIpCfg;
+	}
+	/**
+	 * @param areaIpCfg the areaIpCfg to set
+	 */
+	public void setAreaIpCfg(AreaIpCfg areaIpCfg) {
+		this.areaIpCfg = areaIpCfg;
+	}
+	/**
+	 * ipCfg
+	 * @return  ipCfg
+	*/
+	
+	public Map<String, BaseIpCfg> getIpCfg() {
+		return ipCfg;
+	}
+	/**
+	 * @param ipCfg the ipCfg to set
+	 */
+	public void setIpCfg(Map<String, BaseIpCfg> ipCfg) {
+		this.ipCfg = ipCfg;
+	}
+	/**
+	 * stringCfg
+	 * @return  stringCfg
+	*/
+	
+	public Map<String, BaseStringCfg> getStringCfg() {
+		return stringCfg;
+	}
+	/**
+	 * @param stringCfg the stringCfg to set
+	 */
+	public void setStringCfg(Map<String, BaseStringCfg> stringCfg) {
+		this.stringCfg = stringCfg;
+	}
+	/**
+	 * numCfg
+	 * @return  numCfg
+	*/
+	
+	public Map<String, NumBoundaryCfg> getNumCfg() {
+		return numCfg;
+	}
+	/**
+	 * @param numCfg the numCfg to set
+	 */
+	public void setNumCfg(Map<String, NumBoundaryCfg> numCfg) {
+		this.numCfg = numCfg;
+	}
+	/**
+	 * complexCfg
+	 * @return  complexCfg
+	*/
+	
+	public Map<String, ComplexkeywordCfg> getComplexCfg() {
+		return complexCfg;
+	}
+	/**
+	 * @param complexCfg the complexCfg to set
+	 */
+	public void setComplexCfg(Map<String, ComplexkeywordCfg> complexCfg) {
+		this.complexCfg = complexCfg;
+	}
+	/**
+	 * mainTableType
+	 * @return  mainTableType
+	*/
+	
+	public String getMainTableType() {
+		return mainTableType;
+	}
+	/**
+	 * @param mainTableType the mainTableType to set
+	 */
+	public void setMainTableType(String mainTableType) {
+		this.mainTableType = mainTableType;
+	}
+	/**
+	 * otherTables
+	 * @return  otherTables
+	*/
+	
+	public List<TableBean> getOtherTables() {
+		return otherTables;
+	}
+	/**
+	 * @param otherTables the otherTables to set
+	 */
+	public void setOtherTables(List<TableBean> otherTables) {
+		this.otherTables = otherTables;
+	}
+}

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

@@ -0,0 +1,200 @@
+/**
+ *@Title: MultipleCfg.java
+ *@Package com.nis.domain.configuration 
+ *@Description TODO
+ *@author dell
+ *@date 2018年3月13日 上午8:59:32
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import java.util.List;
+
+/**
+ * @ClassName: MultipleCfg.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年3月13日 上午8:59:32
+ * @version V1.0
+ */
+public class MultipleSearchCfg extends BaseCfg<MultipleSearchCfg> {
+
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private static final long serialVersionUID = -8369567908781421920L;
+	private String mainTable;//主表名
+	private String mainTableType;//主表类型
+	private String ipTable;//查询条件IP表名，界面限制查询条件除了共用属性之外只能查一个条件
+	private String stringTable;//查询条件字符串表名，界面限制查询条件除了共用属性之外只能查一个条件
+	private String complexTable;//查询条件增强字符串串表名，界面限制查询条件除了共用属性之外只能查一个条件
+	private List<TableBean> otherTables;//key 表名，value 类型 
+	//ip配置
+	private BaseIpCfg ipCfg;
+	//字符串配置
+	private BaseStringCfg stringCfg;
+	//数值类配置
+	private NumBoundaryCfg numCfg;
+	//增强字符串配置
+	private ComplexkeywordCfg complexCfg;
+	//地域配置
+	private AreaIpCfg areaIpCfg;
+	/**
+	 * mainTable
+	 * @return  mainTable
+	*/
+	
+	public String getMainTable() {
+		return mainTable;
+	}
+	/**
+	 * @param mainTable the mainTable to set
+	 */
+	public void setMainTable(String mainTable) {
+		this.mainTable = mainTable;
+	}
+	/**
+	 * ipCfg
+	 * @return  ipCfg
+	*/
+	
+	public BaseIpCfg getIpCfg() {
+		return ipCfg;
+	}
+	/**
+	 * @param ipCfg the ipCfg to set
+	 */
+	public void setIpCfg(BaseIpCfg ipCfg) {
+		this.ipCfg = ipCfg;
+	}
+	/**
+	 * stringCfg
+	 * @return  stringCfg
+	*/
+	
+	public BaseStringCfg getStringCfg() {
+		return stringCfg;
+	}
+	/**
+	 * @param stringCfg the stringCfg to set
+	 */
+	public void setStringCfg(BaseStringCfg stringCfg) {
+		this.stringCfg = stringCfg;
+	}
+	/**
+	 * numCfg
+	 * @return  numCfg
+	*/
+	
+	public NumBoundaryCfg getNumCfg() {
+		return numCfg;
+	}
+	/**
+	 * @param numCfg the numCfg to set
+	 */
+	public void setNumCfg(NumBoundaryCfg numCfg) {
+		this.numCfg = numCfg;
+	}
+	/**
+	 * complexCfg
+	 * @return  complexCfg
+	*/
+	
+	public ComplexkeywordCfg getComplexCfg() {
+		return complexCfg;
+	}
+	/**
+	 * @param complexCfg the complexCfg to set
+	 */
+	public void setComplexCfg(ComplexkeywordCfg complexCfg) {
+		this.complexCfg = complexCfg;
+	}
+	/**
+	 * areaIpCfg
+	 * @return  areaIpCfg
+	*/
+	
+	public AreaIpCfg getAreaIpCfg() {
+		return areaIpCfg;
+	}
+	/**
+	 * @param areaIpCfg the areaIpCfg to set
+	 */
+	public void setAreaIpCfg(AreaIpCfg areaIpCfg) {
+		this.areaIpCfg = areaIpCfg;
+	}
+	/**
+	 * mainTableType
+	 * @return  mainTableType
+	*/
+	
+	public String getMainTableType() {
+		return mainTableType;
+	}
+	/**
+	 * @param mainTableType the mainTableType to set
+	 */
+	public void setMainTableType(String mainTableType) {
+		this.mainTableType = mainTableType;
+	}
+	/**
+	 * otherTables
+	 * @return  otherTables
+	*/
+	
+	public List<TableBean> getOtherTables() {
+		return otherTables;
+	}
+	/**
+	 * @param otherTables the otherTables to set
+	 */
+	public void setOtherTables(List<TableBean> otherTables) {
+		this.otherTables = otherTables;
+	}
+	/**
+	 * ipTable
+	 * @return  ipTable
+	*/
+	
+	public String getIpTable() {
+		return ipTable;
+	}
+	/**
+	 * @param ipTable the ipTable to set
+	 */
+	public void setIpTable(String ipTable) {
+		this.ipTable = ipTable;
+	}
+	/**
+	 * stringTable
+	 * @return  stringTable
+	*/
+	
+	public String getStringTable() {
+		return stringTable;
+	}
+	/**
+	 * @param stringTable the stringTable to set
+	 */
+	public void setStringTable(String stringTable) {
+		this.stringTable = stringTable;
+	}
+	/**
+	 * complexTable
+	 * @return  complexTable
+	*/
+	
+	public String getComplexTable() {
+		return complexTable;
+	}
+	/**
+	 * @param complexTable the complexTable to set
+	 */
+	public void setComplexTable(String complexTable) {
+		this.complexTable = complexTable;
+	}
+	
+}

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

@@ -39,7 +39,6 @@ public class NumBoundaryCfg extends BaseCfg<NumBoundaryCfg> {
 	@Expose
 	@SerializedName("upBoundary")
 	protected Long upBoundary;
-	protected Long compileId;
 	/* (non-Javadoc)
 	 * @see com.nis.domain.configuration.BaseCfg#initDefaultValue()
 	 */
@@ -76,19 +75,4 @@ public class NumBoundaryCfg extends BaseCfg<NumBoundaryCfg> {
 	public void setUpBoundary(Long upBoundary) {
 		this.upBoundary = upBoundary;
 	}
-	/**
-	 * compileId
-	 * @return  compileId
-	*/
-	
-	public Long getCompileId() {
-		return compileId;
-	}
-	/**
-	 * @param compileId the compileId to set
-	 */
-	public void setCompileId(Long compileId) {
-		this.compileId = compileId;
-	}
-	
 }

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

@@ -0,0 +1,80 @@
+/**
+ *@Title: TableBean.java
+ *@Package com.nis.domain.configuration 
+ *@Description TODO
+ *@author dell
+ *@date 2018年3月24日 下午5:20:51
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName: TableBean.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年3月24日 下午5:20:51
+ * @version V1.0
+ */
+public class TableBean implements Serializable{
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private static final long serialVersionUID = -7276874824312210708L;
+	private String tableName;
+	private String tableType;
+	private boolean canEmpty;
+	public TableBean(){
+		
+	}
+	public TableBean(String tableName,String tableType){
+		this.tableName=tableName;
+		this.tableType=tableType;
+	}
+	/**
+	 * tableName
+	 * @return  tableName
+	*/
+	
+	public String getTableName() {
+		return tableName;
+	}
+	/**
+	 * @param tableName the tableName to set
+	 */
+	public void setTableName(String tableName) {
+		this.tableName = tableName;
+	}
+	/**
+	 * tableType
+	 * @return  tableType
+	*/
+	
+	public String getTableType() {
+		return tableType;
+	}
+	/**
+	 * @param tableType the tableType to set
+	 */
+	public void setTableType(String tableType) {
+		this.tableType = tableType;
+	}
+	/**
+	 * canEmpty
+	 * @return  canEmpty
+	*/
+	
+	public boolean isCanEmpty() {
+		return canEmpty;
+	}
+	/**
+	 * @param canEmpty the canEmpty to set
+	 */
+	public void setCanEmpty(boolean canEmpty) {
+		this.canEmpty = canEmpty;
+	}
+}

src/main/java/com/nis/domain/maat/DnsIpRecvData.java

@@ -0,0 +1,30 @@
+package com.nis.domain.maat;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class DnsIpRecvData implements Serializable {
+	
+	private static final long serialVersionUID = -3438469380427993582L;
+	@Expose
+	@SerializedName("cfgId")
+	private Long cfgId;
+	@Expose
+	@SerializedName("fakeId")
+	private Integer fakeId;
+	
+	public Long getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Long cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getFakeId() {
+		return fakeId;
+	}
+	public void setFakeId(Integer fakeId) {
+		this.fakeId = fakeId;
+	}
+}

src/main/java/com/nis/domain/maat/FromMaatBean.java

@@ -0,0 +1,24 @@
+package com.nis.domain.maat;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class FromMaatBean implements Serializable {
+
+	private static final long serialVersionUID = 1277140754421705676L;
+	@Expose
+	@SerializedName("data")
+	private List<DnsIpRecvData> data;
+
+	public List<DnsIpRecvData> getData() {
+		return data;
+	}
+
+	public void setData(List<DnsIpRecvData> data) {
+		this.data = data;
+	}
+
+}

src/main/java/com/nis/domain/maat/MaatCfg.java

@@ -9,6 +9,7 @@
 package com.nis.domain.maat;
 
 import java.io.Serializable;
+import java.util.List;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
@@ -35,28 +36,28 @@ public class MaatCfg implements Serializable {
 	private static final long serialVersionUID = -7745084076394247318L;
 	@Expose
 	@SerializedName("strCfg")
-	private BaseStringCfg[] strCfg;
+	private List<BaseStringCfg> strCfg;
 	@Expose
 	@SerializedName("ipCfg")
-	private BaseIpCfg[] ipCfg;
+	private List<BaseIpCfg> ipCfg;
 	@Expose
 	@SerializedName("numCfg")
-	private NumBoundaryCfg[] numCfg;
+	private List<NumBoundaryCfg> numCfg;
 	@Expose
 	@SerializedName("complexStrCfg")
-	private ComplexkeywordCfg[] complexStrCfg;
+	private List<ComplexkeywordCfg> complexStrCfg;
 	/**
 	 * strCfg
 	 * @return  strCfg
 	*/
 	
-	public BaseStringCfg[] getStrCfg() {
+	public List<BaseStringCfg> getStrCfg() {
 		return strCfg;
 	}
 	/**
 	 * @param strCfg the strCfg to set
 	 */
-	public void setStrCfg(BaseStringCfg[] strCfg) {
+	public void setStrCfg(List<BaseStringCfg> strCfg) {
 		this.strCfg = strCfg;
 	}
 	/**
@@ -64,13 +65,13 @@ public class MaatCfg implements Serializable {
 	 * @return  ipCfg
 	*/
 	
-	public BaseIpCfg[] getIpCfg() {
+	public List<BaseIpCfg> getIpCfg() {
 		return ipCfg;
 	}
 	/**
 	 * @param ipCfg the ipCfg to set
 	 */
-	public void setIpCfg(BaseIpCfg[] ipCfg) {
+	public void setIpCfg(List<BaseIpCfg> ipCfg) {
 		this.ipCfg = ipCfg;
 	}
 	/**
@@ -78,13 +79,13 @@ public class MaatCfg implements Serializable {
 	 * @return  numCfg
 	*/
 	
-	public NumBoundaryCfg[] getNumCfg() {
+	public List<NumBoundaryCfg> getNumCfg() {
 		return numCfg;
 	}
 	/**
 	 * @param numCfg the numCfg to set
 	 */
-	public void setNumCfg(NumBoundaryCfg[] numCfg) {
+	public void setNumCfg(List<NumBoundaryCfg> numCfg) {
 		this.numCfg = numCfg;
 	}
 	/**
@@ -92,13 +93,13 @@ public class MaatCfg implements Serializable {
 	 * @return  complexStrCfg
 	*/
 	
-	public ComplexkeywordCfg[] getComplexStrCfg() {
+	public List<ComplexkeywordCfg> getComplexStrCfg() {
 		return complexStrCfg;
 	}
 	/**
 	 * @param complexStrCfg the complexStrCfg to set
 	 */
-	public void setComplexStrCfg(ComplexkeywordCfg[] complexStrCfg) {
+	public void setComplexStrCfg(List<ComplexkeywordCfg> complexStrCfg) {
 		this.complexStrCfg = complexStrCfg;
 	}
 	

src/main/java/com/nis/domain/maat/MaatDnsIpCfg.java

@@ -0,0 +1,24 @@
+package com.nis.domain.maat;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.nis.domain.configuration.DnsIpCfg;
+
+public class MaatDnsIpCfg implements Serializable {
+
+	private static final long serialVersionUID = 2407058503197501569L;
+	
+	@Expose
+	private List<DnsIpCfg> ipCfg;
+
+	public List<DnsIpCfg> getIpCfg() {
+		return ipCfg;
+	}
+
+	public void setIpCfg(List<DnsIpCfg> ipCfg) {
+		this.ipCfg = ipCfg;
+	}
+	
+}

src/main/java/com/nis/domain/maat/ToMaatBean.java

@@ -9,15 +9,11 @@
 package com.nis.domain.maat;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.nis.domain.configuration.AreaIpCfg;
-import com.nis.domain.configuration.IpPortCfg;
 
 /**
  * @ClassName: ToMaatBean.java 
@@ -37,7 +33,7 @@ public class ToMaatBean implements Serializable{
 	private static final long serialVersionUID = 5123156423588372849L;
 	@Expose
 	@SerializedName("serviceCfg")
-	private List<MaatCfg[]> serviceCfg;
+	private List<MaatCfg> serviceCfg;
 	@Expose
 	@SerializedName("areaCfg")
 	private List<AreaIpCfg> areaCfg;
@@ -58,7 +54,7 @@ public class ToMaatBean implements Serializable{
 	private String lable;
 	@Expose
 	@SerializedName("compileId")
-	private Long compileId;
+	private Integer compileId;
 	@Expose
 	@SerializedName("isAreaEffective")
 	private Integer isAreaEffective;
@@ -72,18 +68,19 @@ public class ToMaatBean implements Serializable{
 	@SerializedName("serviceId")
 	private Integer serviceId;
 	
+	
 	/**
 	 * serviceCfg
 	 * @return  serviceCfg
 	*/
 	
-	public List<MaatCfg[]> getServiceCfg() {
+	public List<MaatCfg> getServiceCfg() {
 		return serviceCfg;
 	}
 	/**
 	 * @param serviceCfg the serviceCfg to set
 	 */
-	public void setServiceCfg(List<MaatCfg[]> serviceCfg) {
+	public void setServiceCfg(List<MaatCfg> serviceCfg) {
 		this.serviceCfg = serviceCfg;
 	}
 	/**
@@ -176,13 +173,13 @@ public class ToMaatBean implements Serializable{
 	 * @return  compileId
 	*/
 	
-	public Long getCompileId() {
+	public Integer getCompileId() {
 		return compileId;
 	}
 	/**
 	 * @param compileId the compileId to set
 	 */
-	public void setCompileId(Long compileId) {
+	public void setCompileId(Integer compileId) {
 		this.compileId = compileId;
 	}
 	/**
@@ -242,22 +239,6 @@ public class ToMaatBean implements Serializable{
 		this.serviceId = serviceId;
 	}
 	public static void main(String[] args) {
-		Gson gson=new GsonBuilder().disableHtmlEscaping()
-				.setDateFormat("yyyy-MM-dd HH:mm:ss")
-				.setPrettyPrinting()/*.serializeNulls()*/
-				.excludeFieldsWithoutExposeAnnotation()
-				.create();
-		ToMaatBean bean=new ToMaatBean();
-		List<MaatCfg[]> cfg=new ArrayList<>();
-		MaatCfg[] ma=new MaatCfg[1];
-		MaatCfg mc=new MaatCfg();
-		IpPortCfg[] a=new IpPortCfg[1];
-		a[0]=new IpPortCfg();
-		mc.setIpCfg(a);
-		ma[0]=mc;
-		cfg.add(ma);
-		bean.setServiceCfg(cfg);
-		System.out.println(gson.toJson(bean));
 		
 	}
 }

src/main/java/com/nis/domain/maat/ToMaatDnsIpBean.java

@@ -0,0 +1,62 @@
+package com.nis.domain.maat;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+
+public class ToMaatDnsIpBean implements Serializable {
+
+	private static final long serialVersionUID = 5124353996884030213L;
+	
+	@Expose
+	private List<MaatDnsIpCfg> serviceCfg;
+	@Expose
+	private String attribute;
+	@Expose
+	private String classify;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private String lable;
+	@Expose
+	private Integer requestId;
+	
+	public List<MaatDnsIpCfg> getServiceCfg() {
+		return serviceCfg;
+	}
+	public void setServiceCfg(List<MaatDnsIpCfg> serviceCfg) {
+		this.serviceCfg = serviceCfg;
+	}
+	public String getAttribute() {
+		return attribute;
+	}
+	public void setAttribute(String attribute) {
+		this.attribute = attribute;
+	}
+	public String getClassify() {
+		return classify;
+	}
+	public void setClassify(String classify) {
+		this.classify = classify;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public String getLable() {
+		return lable;
+	}
+	public void setLable(String lable) {
+		this.lable = lable;
+	}
+	public Integer getRequestId() {
+		return requestId;
+	}
+	public void setRequestId(Integer requestId) {
+		this.requestId = requestId;
+	}
+
+}

src/main/java/com/nis/domain/maat/ToMaatUnAuditBean.java

@@ -0,0 +1,51 @@
+/**
+ *@Title: ToMaatBean.java
+ *@Package com.nis.domain.configuration 
+ *@Description TODO
+ *@author dell
+ *@date 2018年2月28日 下午2:03:08
+ *@version  版本号
+ */
+package com.nis.domain.maat;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * @ClassName: ToMaatBean.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年2月28日 下午2:03:08
+ * @version V1.0
+ */
+public class ToMaatUnAuditBean implements Serializable{
+
+	/**
+	 * @Fields serialVersionUID:TODO（转换为maat格式的java bean）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private static final long serialVersionUID = 5123156423588372849L;
+	@Expose
+	@SerializedName("serviceCfg")
+	private List<UnAuditBean> serviceCfg;
+	/**
+	 * serviceCfg
+	 * @return  serviceCfg
+	*/
+	
+	public List<UnAuditBean> getServiceCfg() {
+		return serviceCfg;
+	}
+	/**
+	 * @param serviceCfg the serviceCfg to set
+	 */
+	public void setServiceCfg(List<UnAuditBean> serviceCfg) {
+		this.serviceCfg = serviceCfg;
+	}
+	
+}

src/main/java/com/nis/domain/maat/UnAuditBean.java

@@ -0,0 +1,66 @@
+/**
+ *@Title: UnAuditBean.java
+ *@Package com.nis.domain.maat 
+ *@Description TODO
+ *@author dell
+ *@date 2018年3月26日 下午1:30:07
+ *@version  版本号
+ */
+package com.nis.domain.maat;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * @ClassName: UnAuditBean.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年3月26日 下午1:30:07
+ * @version V1.0
+ */
+public class UnAuditBean implements Serializable{
+
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private static final long serialVersionUID = -3497633085090859526L;
+	@Expose
+	@SerializedName("compileId")
+	private Integer compileId;
+	@Expose
+	@SerializedName("maatTable")
+	private String maatTable;
+	/**
+	 * compileId
+	 * @return  compileId
+	*/
+	
+	public Integer getCompileId() {
+		return compileId;
+	}
+	/**
+	 * @param compileId the compileId to set
+	 */
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+	/**
+	 * maatTable
+	 * @return  maatTable
+	*/
+	
+	public String getMaatTable() {
+		return maatTable;
+	}
+	/**
+	 * @param maatTable the maatTable to set
+	 */
+	public void setMaatTable(String maatTable) {
+		this.maatTable = maatTable;
+	}
+}