①修复新增，修改，列表展示配置时分类性质标签展示的问题

②列表展示时采用遍历分类性质标签的方法展示，减少数据库查询时的压力 ③取掉了一些不需要展示的列 ④新增Maat转换的bean ⑤采用gson的方式对在bean上做注解做转换，禁止了htmlescape
2018-03-05 16:30:16 +08:00
parent 363544a443
commit 848087dbef
33 changed files with 797 additions and 218 deletions
--- a/src/main/java/com/nis/domain/configuration/AreaIpCfg.java
+++ b/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()
--- a/src/main/java/com/nis/domain/configuration/BaseCfg.java
+++ b/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;
+	}
 	
 }
--- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
+++ b/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
--- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java
+++ b/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;
 	
 	/**
--- a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java
+++ b/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
--- a/src/main/java/com/nis/domain/configuration/IpPortCfg.java
+++ b/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);
+	}
 	
 }
--- a/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java
+++ b/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
--- a/src/main/java/com/nis/domain/maat/MaatCfg.java
+++ b/src/main/java/com/nis/domain/maat/MaatCfg.java
@@ -0,0 +1,105 @@
+/**
+ *@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 com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.BaseStringCfg;
+import com.nis.domain.configuration.ComplexkeywordCfg;
+import com.nis.domain.configuration.NumBoundaryCfg;
+
+/**
+ * @ClassName: MaatCfg.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年3月1日 上午10:29:29
+ * @version V1.0
+ */
+public class MaatCfg implements Serializable {
+
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private static final long serialVersionUID = -7745084076394247318L;
+	@Expose
+	@SerializedName("strCfg")
+	private BaseStringCfg[] strCfg;
+	@Expose
+	@SerializedName("ipCfg")
+	private BaseIpCfg[] ipCfg;
+	@Expose
+	@SerializedName("numCfg")
+	private NumBoundaryCfg[] numCfg;
+	@Expose
+	@SerializedName("complexStrCfg")
+	private ComplexkeywordCfg[] complexStrCfg;
+	/**
+	 * strCfg
+	 * @return  strCfg
+	*/
+	
+	public BaseStringCfg[] getStrCfg() {
+		return strCfg;
+	}
+	/**
+	 * @param strCfg the strCfg to set
+	 */
+	public void setStrCfg(BaseStringCfg[] strCfg) {
+		this.strCfg = strCfg;
+	}
+	/**
+	 * ipCfg
+	 * @return  ipCfg
+	*/
+	
+	public BaseIpCfg[] getIpCfg() {
+		return ipCfg;
+	}
+	/**
+	 * @param ipCfg the ipCfg to set
+	 */
+	public void setIpCfg(BaseIpCfg[] ipCfg) {
+		this.ipCfg = ipCfg;
+	}
+	/**
+	 * numCfg
+	 * @return  numCfg
+	*/
+	
+	public NumBoundaryCfg[] getNumCfg() {
+		return numCfg;
+	}
+	/**
+	 * @param numCfg the numCfg to set
+	 */
+	public void setNumCfg(NumBoundaryCfg[] numCfg) {
+		this.numCfg = numCfg;
+	}
+	/**
+	 * complexStrCfg
+	 * @return  complexStrCfg
+	*/
+	
+	public ComplexkeywordCfg[] getComplexStrCfg() {
+		return complexStrCfg;
+	}
+	/**
+	 * @param complexStrCfg the complexStrCfg to set
+	 */
+	public void setComplexStrCfg(ComplexkeywordCfg[] complexStrCfg) {
+		this.complexStrCfg = complexStrCfg;
+	}
+	
+}
--- a/src/main/java/com/nis/domain/maat/ToMaatBean.java
+++ b/src/main/java/com/nis/domain/maat/ToMaatBean.java
@@ -0,0 +1,263 @@
+/**
+ *@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.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 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年2月28日 下午2:03:08
+ * @version V1.0
+ */
+public class ToMaatBean implements Serializable{
+
+	/**
+	 * @Fields serialVersionUID:TODO（转换为maat格式的java bean）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private static final long serialVersionUID = 5123156423588372849L;
+	@Expose
+	@SerializedName("serviceCfg")
+	private List<MaatCfg[]> serviceCfg;
+	@Expose
+	@SerializedName("areaCfg")
+	private List<AreaIpCfg> areaCfg;
+	@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 Long 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;
+	
+	/**
+	 * serviceCfg
+	 * @return  serviceCfg
+	*/
+	
+	public List<MaatCfg[]> getServiceCfg() {
+		return serviceCfg;
+	}
+	/**
+	 * @param serviceCfg the serviceCfg to set
+	 */
+	public void setServiceCfg(List<MaatCfg[]> serviceCfg) {
+		this.serviceCfg = serviceCfg;
+	}
+	/**
+	 * areaCfg
+	 * @return  areaCfg
+	*/
+	
+	public List<AreaIpCfg> getAreaCfg() {
+		return areaCfg;
+	}
+	/**
+	 * @param areaCfg the areaCfg to set
+	 */
+	public void setAreaCfg(List<AreaIpCfg> areaCfg) {
+		this.areaCfg = areaCfg;
+	}
+	/**
+	 * action
+	 * @return  action
+	*/
+	
+	public Integer getAction() {
+		return action;
+	}
+	/**
+	 * @param action the action to set
+	 */
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	/**
+	 * areaEffectiveIds
+	 * @return  areaEffectiveIds
+	*/
+	
+	public String getAreaEffectiveIds() {
+		return areaEffectiveIds;
+	}
+	/**
+	 * @param areaEffectiveIds the areaEffectiveIds to set
+	 */
+	public void setAreaEffectiveIds(String areaEffectiveIds) {
+		this.areaEffectiveIds = areaEffectiveIds;
+	}
+	/**
+	 * attribute
+	 * @return  attribute
+	*/
+	
+	public String getAttribute() {
+		return attribute;
+	}
+	/**
+	 * @param attribute the attribute to set
+	 */
+	public void setAttribute(String attribute) {
+		this.attribute = attribute;
+	}
+	/**
+	 * classify
+	 * @return  classify
+	*/
+	
+	public String getClassify() {
+		return classify;
+	}
+	/**
+	 * @param classify the classify to set
+	 */
+	public void setClassify(String classify) {
+		this.classify = classify;
+	}
+	
+	/**
+	 * lable
+	 * @return  lable
+	*/
+	
+	public String getLable() {
+		return lable;
+	}
+	/**
+	 * @param lable the lable to set
+	 */
+	public void setLable(String lable) {
+		this.lable = lable;
+	}
+	/**
+	 * compileId
+	 * @return  compileId
+	*/
+	
+	public Long getCompileId() {
+		return compileId;
+	}
+	/**
+	 * @param compileId the compileId to set
+	 */
+	public void setCompileId(Long compileId) {
+		this.compileId = compileId;
+	}
+	/**
+	 * isAreaEffective
+	 * @return  isAreaEffective
+	*/
+	
+	public Integer getIsAreaEffective() {
+		return isAreaEffective;
+	}
+	/**
+	 * @param isAreaEffective the isAreaEffective to set
+	 */
+	public void setIsAreaEffective(Integer isAreaEffective) {
+		this.isAreaEffective = isAreaEffective;
+	}
+	/**
+	 * isValid
+	 * @return  isValid
+	*/
+	
+	public Integer getIsValid() {
+		return isValid;
+	}
+	/**
+	 * @param isValid the isValid to set
+	 */
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	/**
+	 * requestId
+	 * @return  requestId
+	*/
+	
+	public Integer getRequestId() {
+		return requestId;
+	}
+	/**
+	 * @param requestId the requestId to set
+	 */
+	public void setRequestId(Integer requestId) {
+		this.requestId = requestId;
+	}
+	/**
+	 * serviceId
+	 * @return  serviceId
+	*/
+	
+	public Integer getServiceId() {
+		return serviceId;
+	}
+	/**
+	 * @param serviceId the serviceId to set
+	 */
+	public void setServiceId(Integer serviceId) {
+		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));
+		
+	}
+}