1:更新642的表达式结构,及添加opTime字段

2:为0x401  APP载荷特征表添加数值类表APP_TCP_SESSION_BYTE
3:更新urlreport接口
4:更新asnreport接口
5:添加iprange统计入库
6:修改配置入库时,先打印错误信息在回滚事务
7:修改配置入库打印的日志信息
8:更改通联关系app_label的数据类型为varchar
9:提交洪庆发来的trafficIpActiveStatisticDao.xml

src/main/java/com/nis/domain/restful/NtcAsnRecord.java

@@ -20,11 +20,12 @@ public class NtcAsnRecord implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private String bps;
 	private String pps;
-	private String sAsn;
-	private String dAsn;
+	private String asn;
 	private String searchFoundStartTime;// 开始发现时间
 	private String searchFoundEndTime;// 结束发现时间
 
+	private String searchAsnType;// 1是d_asn,2是s_asn
+
 	public String getBps() {
 		return bps;
 	}
@@ -41,20 +42,21 @@ public class NtcAsnRecord implements Serializable {
 		this.pps = pps;
 	}
 
-	public String getsAsn() {
-		return sAsn;
+	public String getAsn() {
+		return asn;
 	}
 
-	public void setsAsn(String sAsn) {
-		this.sAsn = sAsn;
+	public void setAsn(String asn) {
+		this.asn = asn;
 	}
 
-	public String getdAsn() {
-		return dAsn;
+	@JsonIgnore
+	public String getSearchAsnType() {
+		return searchAsnType;
 	}
 
-	public void setdAsn(String dAsn) {
-		this.dAsn = dAsn;
+	public void setSearchAsnType(String searchAsnType) {
+		this.searchAsnType = searchAsnType;
 	}
 
 	@JsonIgnore

src/main/java/com/nis/domain/restful/NtcConnRecordLog.java

@@ -17,9 +17,9 @@ public class NtcConnRecordLog extends LogEntity<NtcConnRecordLog> {
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 1L;
+	private static final Long serialVersionUID = 1L;
 	@ApiModelProperty(value = "", required = true)
-	protected Long appLabel;
+	protected String appLabel;
 	@ApiModelProperty(value = "", required = true)
 	protected String c2sPktNum;
 	@ApiModelProperty(value = "", required = true)
@@ -29,11 +29,11 @@ public class NtcConnRecordLog extends LogEntity<NtcConnRecordLog> {
 	@ApiModelProperty(value = "", required = true)
 	protected String s2cByteNum;
 
-	public Long getAppLabel() {
+	public String getAppLabel() {
 		return appLabel;
 	}
 
-	public void setAppLabel(Long appLabel) {
+	public void setAppLabel(String appLabel) {
 		this.appLabel = appLabel;
 	}
 

src/main/java/com/nis/domain/restful/NtcIpRangeReport.java

@@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.collect.Maps;
 import com.nis.domain.Page;
 
-public class NtcIpRangeReport<T>  implements Serializable {
+public class NtcIpRangeReport<T> implements Serializable {
 
 	/**
 	 * 
@@ -24,11 +24,11 @@ public class NtcIpRangeReport<T>  implements Serializable {
 	private Long ipEndNum;
 	private String ipSub;
 	private String country;
+
+	private Integer areaType;
 	private String searchType;
 	private String searchCountry;
 
-	
-	
 	public String getIpStart() {
 		return ipStart;
 	}
@@ -77,6 +77,14 @@ public class NtcIpRangeReport<T>  implements Serializable {
 		this.country = country;
 	}
 
+	public Integer getAreaType() {
+		return areaType;
+	}
+
+	public void setAreaType(Integer areaType) {
+		this.areaType = areaType;
+	}
+
 	@JsonIgnore
 	public String getSearchType() {
 		return searchType;
@@ -95,5 +103,4 @@ public class NtcIpRangeReport<T>  implements Serializable {
 		this.searchCountry = searchCountry;
 	}
 
-
 }

src/main/java/com/nis/domain/restful/NtcIpURLReport.java

@@ -1,46 +0,0 @@
-package com.nis.domain.restful;
-
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.wordnik.swagger.annotations.ApiModelProperty;
-
-public class NtcIpURLReport implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	@ApiModelProperty(value = "日志数量", required = true)
-	private Long sum;
-	@ApiModelProperty(value = "ip地址", required = true)
-	private String ipAddr;
-	@ApiModelProperty(value = "url", required = true)
-	private String url;
-
-	public Long getSum() {
-		return sum;
-	}
-
-	public void setSum(Long sum) {
-		this.sum = sum;
-	}
-
-	public String getIpAddr() {
-		return ipAddr;
-	}
-
-	public void setIpAddr(String ipAddr) {
-		this.ipAddr = ipAddr;
-	}
-
-	@JsonIgnore
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-}

src/main/java/com/nis/domain/restful/NtcURLIpReport.java

@@ -1,11 +1,9 @@
 package com.nis.domain.restful;
 
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.wordnik.swagger.annotations.ApiModelProperty;
 
-public class NtcURLReport extends NtcReportEntity<NtcURLReport> {
+public class NtcURLIpReport extends NtcReportEntity<NtcURLIpReport> {
 
 	/**
 	 * 
@@ -13,14 +11,13 @@ public class NtcURLReport extends NtcReportEntity<NtcURLReport> {
 	private static final long serialVersionUID = 1L;
 	@ApiModelProperty(value = "url", required = true)
 	private String url;
-	@ApiModelProperty(value = "日志数量", required = true)
-	private Long urlCount;
-	@ApiModelProperty(value = "ip数量列表", required = true)
-	private List<NtcIpURLReport> dataList;
-	
-	
-	private String searchUrl;
+	@ApiModelProperty(value = "唯一ip的数量", required = true)
+	private Long ipCount;
+	@ApiModelProperty(value = "连接数量", required = true)
+	private Long connCount;
 
+	private String searchUrl;
+	
 	public String getUrl() {
 		return url;
 	}
@@ -29,20 +26,20 @@ public class NtcURLReport extends NtcReportEntity<NtcURLReport> {
 		this.url = url;
 	}
 
-	public Long getUrlCount() {
-		return urlCount;
+	public Long getIpCount() {
+		return ipCount;
 	}
 
-	public void setUrlCount(Long urlCount) {
-		this.urlCount = urlCount;
+	public void setIpCount(Long ipCount) {
+		this.ipCount = ipCount;
 	}
 
-	public List<NtcIpURLReport> getDataList() {
-		return dataList;
+	public Long getConnCount() {
+		return connCount;
 	}
 
-	public void setDataList(List<NtcIpURLReport> dataList) {
-		this.dataList = dataList;
+	public void setConnCount(Long connCount) {
+		this.connCount = connCount;
 	}
 	@JsonIgnore
 	public String getSearchUrl() {
@@ -52,7 +49,5 @@ public class NtcURLReport extends NtcReportEntity<NtcURLReport> {
 	public void setSearchUrl(String searchUrl) {
 		this.searchUrl = searchUrl;
 	}
-	
-	
 
 }