完善社交应用审核通过、取消审核通过界面端功能逻辑。

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

@@ -0,0 +1,54 @@
+/**
+ *@Title: BaseEnhancedStringConfig.java
+ *@Package com.nis.domain.restful 
+ *@Description TODO
+ *@author dell
+ *@date 2018年2月5日 下午5:42:52
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * @ClassName: BaseEnhancedStringConfig.java 
+ * @Description: APP增强字符串类配置
+ * @author (zhangwei)
+ * @date 2018年4月3日 下午5:42:52
+ * @version V1.0
+ */
+public class AppComplexKeywordCfg extends ComplexkeywordCfg{
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8058690163147881374L;
+	@Expose
+	private Integer compileId;
+	
+	public Integer getCompileId() {
+		return compileId;
+	}
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+	/* (non-Javadoc)
+	 * @see com.nis.domain.configuration.BaseCfg#initDefaultValue()
+	 */
+	@Override
+	public void initDefaultValue() {
+		// TODO Auto-generated method stub
+		super.initDefaultValue();
+		this.exprType=0;
+		this.isHexbin = 0 ;
+		this.matchMethod=3;
+	}
+}

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

@@ -32,7 +32,7 @@ public class AppIdCfg extends BaseCfg<AppIdCfg> {
 	/**
 	 * 应用协议id
 	 */
-	private Long appId;
+	private Integer appId;
 	
 	/**
 	 * 编译id
@@ -42,12 +42,17 @@ public class AppIdCfg extends BaseCfg<AppIdCfg> {
 	/**
 	 * 协议字符串特征表信息列表
 	 */
-	private List<ComplexkeywordCfg> complexFeaturesList;
+	private List<AppComplexKeywordCfg> complexFeaturesList;
 	
 	/**
 	 * 协议增强字符串特征配置信息列表
 	 */
-	private List<BaseStringCfg> strFeaturesCfgList;
+	private List<AppStringCfg> strFeaturesCfgList;
+	
+	/**
+	 * 协议服务器IP配置信息列表
+	 */
+	private List<BaseIpCfg> ipCfgList;
 	
 	private List<AppFeaturesIndex> featuresList;
 	
@@ -111,14 +116,14 @@ public class AppIdCfg extends BaseCfg<AppIdCfg> {
 	 * @return  appId
 	*/
 	
-	public Long getAppId() {
+	public Integer getAppId() {
 		return appId;
 	}
 
 	/**
 	 * @param appId the appId to set
 	 */
-	public void setAppId(Long appId) {
+	public void setAppId(Integer appId) {
 		this.appId = appId;
 	}
 
@@ -149,19 +154,19 @@ public class AppIdCfg extends BaseCfg<AppIdCfg> {
 		
 	}
 
-	public List<ComplexkeywordCfg> getComplexFeaturesList() {
+	public List<AppComplexKeywordCfg> getComplexFeaturesList() {
 		return complexFeaturesList;
 	}
 
-	public void setComplexFeaturesList(List<ComplexkeywordCfg> complexFeaturesList) {
+	public void setComplexFeaturesList(List<AppComplexKeywordCfg> complexFeaturesList) {
 		this.complexFeaturesList = complexFeaturesList;
 	}
 
-	public List<BaseStringCfg> getStrFeaturesCfgList() {
+	public List<AppStringCfg> getStrFeaturesCfgList() {
 		return strFeaturesCfgList;
 	}
 
-	public void setStrFeaturesCfgList(List<BaseStringCfg> strFeaturesCfgList) {
+	public void setStrFeaturesCfgList(List<AppStringCfg> strFeaturesCfgList) {
 		this.strFeaturesCfgList = strFeaturesCfgList;
 	}
 
@@ -172,5 +177,13 @@ public class AppIdCfg extends BaseCfg<AppIdCfg> {
 	public void setFeaturesList(List<AppFeaturesIndex> featuresList) {
 		this.featuresList = featuresList;
 	}
+
+	public List<BaseIpCfg> getIpCfgList() {
+		return ipCfgList;
+	}
+
+	public void setIpCfgList(List<BaseIpCfg> ipCfgList) {
+		this.ipCfgList = ipCfgList;
+	}
 	
 }

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

@@ -0,0 +1,50 @@
+/**
+ *@Title: BaseStringConfig.java
+ *@Package com.nis.domain.restful 
+ *@Description TODO
+ *@author dell
+ *@date 2018年2月5日 下午5:26:02
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * @ClassName: BaseStringConfig.java 
+ * @Description: 基础字符串类配置
+ * @author (dell)
+ * @date 2018年2月5日 下午5:26:02
+ * @version V1.0
+ */
+public class AppStringCfg extends BaseStringCfg {
+
+	
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	private static final long serialVersionUID = 4938724489988587634L;
+	@Expose
+	private Integer compileId;
+	
+	/* (non-Javadoc)
+	 * @see com.nis.domain.configuration.BaseCfg#initDefaultValue()
+	 */
+	@Override
+	public void initDefaultValue() {
+		// TODO Auto-generated method stub
+		super.initDefaultValue();
+		this.isHexbin = 0;
+	}
+	
+	public Integer getCompileId() {
+		return compileId;
+	}
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+	
+}

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

@@ -0,0 +1,200 @@
+/**
+ *@Title: MaatCfg.java
+ *@Package com.nis.domain.maat 
+ *@Description TODO
+ *@author dell
+ *@date 2018年3月1日 上午10:29:29
+ *@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;
+import com.nis.domain.configuration.AppComplexKeywordCfg;
+import com.nis.domain.configuration.AppStringCfg;
+import com.nis.domain.configuration.AreaIpCfg;
+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.domain.specific.SpecificServiceHostCfg;
+
+/**
+ * @ClassName: MaatCfg.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年3月1日 上午10:29:29
+ * @version V1.0
+ */
+public class AppMaatCfg implements Serializable {
+
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private static final long serialVersionUID = -7745084076394247318L;
+	/**
+	 * APP字符串特征配置
+	 */
+	@Expose
+	@SerializedName("strFeaturesCfg")
+	private List<AppStringCfg> strCfg;
+	/**
+	 * APP服务器IP配置
+	 */
+	@Expose
+	@SerializedName("specificServiceIpCfg")
+	private List<SpecificServiceHostCfg> ipCfg;
+	/**
+	 * APP服务器IP生效区域配置
+	 */
+	@Expose
+	@SerializedName("areaCfg")
+	private List<BaseIpCfg> areaCfg;
+	/**
+	 * APP增强字符串特征配置
+	 */
+	@Expose
+	@SerializedName("complexStrFeaturesCfg")
+	private List<AppComplexKeywordCfg> complexStrCfg;
+	
+	@Expose
+	@SerializedName("action")
+	private Integer action;
+	@Expose
+	@SerializedName("areaEffectiveIds")
+	private String areaEffectiveIds;
+	@Expose
+	@SerializedName("attribute")
+	private String attribute;
+	@Expose
+	@SerializedName("classify")
+	private String classify;
+	@Expose
+	@SerializedName("lable")
+	private String lable;
+	@Expose
+	@SerializedName("compileId")
+	private Integer compileId;
+	@Expose
+	@SerializedName("isAreaEffective")
+	private Integer isAreaEffective;
+	@Expose
+	@SerializedName("isValid")
+	private Integer isValid;
+	@Expose
+	@SerializedName("requestId")
+	private Integer requestId;
+	@Expose
+	@SerializedName("serviceId")
+	private Integer serviceId; 
+	@Expose
+	@SerializedName("specificServiceId")
+	private Integer specificServiceId;
+	
+	@Expose
+	private String maatTable;
+	
+	public List<AppStringCfg> getStrCfg() {
+		return strCfg;
+	}
+	public void setStrCfg(List<AppStringCfg> strCfg) {
+		this.strCfg = strCfg;
+	}
+	public List<SpecificServiceHostCfg> getIpCfg() {
+		return ipCfg;
+	}
+	public void setIpCfg(List<SpecificServiceHostCfg> ipCfg) {
+		this.ipCfg = ipCfg;
+	}
+	public List<AppComplexKeywordCfg> getComplexStrCfg() {
+		return complexStrCfg;
+	}
+	public void setComplexStrCfg(List<AppComplexKeywordCfg> complexStrCfg) {
+		this.complexStrCfg = complexStrCfg;
+	}
+	public List<BaseIpCfg> getAreaCfg() {
+		return areaCfg;
+	}
+	public void setAreaCfg(List<BaseIpCfg> areaCfg) {
+		this.areaCfg = areaCfg;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public String getAreaEffectiveIds() {
+		return areaEffectiveIds;
+	}
+	public void setAreaEffectiveIds(String areaEffectiveIds) {
+		this.areaEffectiveIds = areaEffectiveIds;
+	}
+	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 String getLable() {
+		return lable;
+	}
+	public void setLable(String lable) {
+		this.lable = lable;
+	}
+	public Integer getCompileId() {
+		return compileId;
+	}
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+	public Integer getIsAreaEffective() {
+		return isAreaEffective;
+	}
+	public void setIsAreaEffective(Integer isAreaEffective) {
+		this.isAreaEffective = isAreaEffective;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Integer getRequestId() {
+		return requestId;
+	}
+	public void setRequestId(Integer requestId) {
+		this.requestId = requestId;
+	}
+	public Integer getServiceId() {
+		return serviceId;
+	}
+	public void setServiceId(Integer serviceId) {
+		this.serviceId = serviceId;
+	}
+	public Integer getSpecificServiceId() {
+		return specificServiceId;
+	}
+	public void setSpecificServiceId(Integer specificServiceId) {
+		this.specificServiceId = specificServiceId;
+	}
+	public String getMaatTable() {
+		return maatTable;
+	}
+	public void setMaatTable(String maatTable) {
+		this.maatTable = maatTable;
+	}
+	
+}

src/main/java/com/nis/domain/specific/ConfigGroupInfo.java

@@ -0,0 +1,56 @@
+package com.nis.domain.specific;
+
+import java.util.Date;
+
+public class ConfigGroupInfo {
+	private Integer id;
+	private Integer groupId;
+	private String groupName;
+	private Integer isIssued;
+	private Date insertTime;
+	private Date updateTime;
+	private Integer groupType;
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	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 Integer getIsIssued() {
+		return isIssued;
+	}
+	public void setIsIssued(Integer isIssued) {
+		this.isIssued = isIssued;
+	}
+	public Date getInsertTime() {
+		return insertTime;
+	}
+	public void setInsertTime(Date insertTime) {
+		this.insertTime = insertTime;
+	}
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	public Integer getGroupType() {
+		return groupType;
+	}
+	public void setGroupType(Integer groupType) {
+		this.groupType = groupType;
+	}
+	
+}

src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java

@@ -4,6 +4,8 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 import com.nis.domain.BaseEntity;
 import com.nis.domain.SysUser;
 
@@ -15,21 +17,34 @@ import com.nis.domain.SysUser;
 public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
 
 	private static final long serialVersionUID = -301627652860717175L;
-	
+	@Expose
+	@SerializedName("cfgId")
 	private Integer hostId; //host_id	配置ID	bigint	N	主键，自增
 	private Integer specServiceId; //spec_service_id	协议id	int	N	protocol_info_cfg.protocol_id
+	@Expose
 	private Integer ipType; //ip地址类型 ipV4=4 ipV6=6
+	@Expose
 	private String srcIp; //src_ip	源IP地址	varchar(64)	N	缺省0.0.0.0值表示任意
+	@Expose
 	private String srcIpMask; //src_ip_mask	源地址掩码	varchar(64)	N	IPV4:255.255.255.255表示无掩码，即精确IP匹配，0.0.0.0值表示任意；
 	                          //IPV6：FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF表示无掩码，::（两个半角冒号）表示任意。非0掩码值必须是2的指数幂，下同。
+	@Expose
 	private String srcPort; //src_port	源端口	varchar(6)	N	0表示任意值
+	@Expose
 	private String srcPortMask; //src_port_mask	源端口掩码	varchar(6)	N	65535表示无掩码，即精确端口匹配，0表示任意
+	@Expose
 	private String dstIp; //dst_ip	目的IP地址	varchar(64)	N	缺省0.0.0.0值表示任意
+	@Expose
 	private String dstIpMask; //dst_ip_mask	目的地址掩码	varchar(64)	N	同源ip地址掩码
+	@Expose
 	private String dstPort; //dst_port	目的端口	varchar(6)	N	目的端口,0表示任意值
+	@Expose
 	private String dstPortMask; //dst_port_mask	目的端口掩码	varchar(6)	N	同源端口掩码
+	@Expose
 	private Integer direction;; //direction	方向	int	N	0双向，1单向，默认缺省为双向。
+	@Expose
 	private Integer protocol; //protocol	协议	int	N	6表示tcp,17表示udp，0表示任意
+	
 	private Integer isValid; //is_valid	有效标识	int	N	0无效，1有效
     private Integer isAudit; //is_audit	是否审核	int	N	0未审核，1审核通过，2审核未通过，3取消审核通过（即删除）
 	private SysUser creator; //creator_id	创建人员	int	N	取自sys_user.id
@@ -38,9 +53,12 @@ public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
 	private Date editTime; //edit_time	修改时间	date	Y	
 	private SysUser auditor; //auditor_id	审核人员	int	Y	取自sys_user.id
 	private Date auditTime; //audit_time	审核时间	date	Y	
-	
-	
-	
+	@Expose
+	private Integer protocolId;//配置转json下发时使用
+	@Expose
+	private String maatTable;//配置转json下发时使用
+	@Expose
+	private Integer groupId;//配置转json下发时使用
 	
 	private Date beginDate;
 	private Date endDate;
@@ -226,11 +244,23 @@ public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
 	public static void sort(List<SpecificServiceHostCfg> list, List<SpecificServiceHostCfg> sourceList, Integer ParentId, boolean cascade){
 		
 	}
-	
-	
-	
-	
-	
-	
+	public Integer getProtocolId() {
+		return protocolId;
+	}
+	public void setProtocolId(Integer protocolId) {
+		this.protocolId = protocolId;
+	}
+	public String getMaatTable() {
+		return maatTable;
+	}
+	public void setMaatTable(String maatTable) {
+		this.maatTable = maatTable;
+	}
+	public Integer getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
 
 }