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/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;
 	}
 
-
 }