Merge branch 'revert-3e935610' into 'develop'

Revert "Pojo统一修改compileId类型为Long"

See merge request !1

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

@@ -32,12 +32,12 @@ public class AppComplexKeywordCfg extends ComplexkeywordCfg{
 	 */
 	private static final long serialVersionUID = -8058690163147881374L;
 	@Expose
-	private Long compileId;
+	private Integer compileId;
 	
-	public Long getCompileId() {
+	public Integer getCompileId() {
 		return compileId;
 	}
-	public void setCompileId(Long compileId) {
+	public void setCompileId(Integer compileId) {
 		this.compileId = compileId;
 	}
 	/* (non-Javadoc)

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

@@ -37,7 +37,7 @@ public class AppIdCfg extends BaseCfg<AppIdCfg> {
 	/**
 	 * 编译id
 	 */
-	private Long compileId;
+	private Integer compileId;
 
 	/**
 	 * 协议字符串特征表信息列表
@@ -132,14 +132,14 @@ public class AppIdCfg extends BaseCfg<AppIdCfg> {
 	 * @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;
 	}
 

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

@@ -28,7 +28,7 @@ public class AppStringCfg extends BaseStringCfg {
 	 */
 	private static final long serialVersionUID = 4938724489988587634L;
 	@Expose
-	private Long compileId;
+	private Integer compileId;
 	
 	/* (non-Javadoc)
 	 * @see com.nis.domain.configuration.BaseCfg#initDefaultValue()
@@ -40,10 +40,10 @@ public class AppStringCfg extends BaseStringCfg {
 		this.isHexbin = 0;
 	}
 	
-	public Long getCompileId() {
+	public Integer getCompileId() {
 		return compileId;
 	}
-	public void setCompileId(Long compileId) {
+	public void setCompileId(Integer compileId) {
 		this.compileId = compileId;
 	}
 	

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

@@ -24,7 +24,7 @@ public class AvFileSampleCfg extends BaseCfg<AvFileSampleCfg> {
 	private Integer level;
 	@Expose
 	@SerializedName("cfgId")
-	private Long compileId;
+	private Integer compileId;
 	private String srcPath;
 	private String samplePath;
 
@@ -40,10 +40,10 @@ public class AvFileSampleCfg extends BaseCfg<AvFileSampleCfg> {
 	public void setSamplePath(String samplePath) {
 		this.samplePath = samplePath;
 	}
-	public Long getCompileId() {
+	public Integer getCompileId() {
 		return compileId;
 	}
-	public void setCompileId(Long compileId) {
+	public void setCompileId(Integer compileId) {
 		this.compileId = compileId;
 	}
 	public String getSrcUrl() {

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

@@ -15,7 +15,7 @@ public class AvSignSampleCfg extends BaseCfg<AvSignSampleCfg> {
 	private Integer level;
 	@Expose
 	@SerializedName("cfgId")
-	private Long compileId;
+	private Integer compileId;
 	public String getDescription() {
 		return description;
 	}
@@ -28,10 +28,10 @@ public class AvSignSampleCfg extends BaseCfg<AvSignSampleCfg> {
 	public void setLevel(Integer level) {
 		this.level = level;
 	}
-	public Long getCompileId() {
+	public Integer getCompileId() {
 		return compileId;
 	}
-	public void setCompileId(Long compileId) {
+	public void setCompileId(Integer compileId) {
 		this.compileId = compileId;
 	}
 	

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

@@ -33,7 +33,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 编译id
 	 */
-	protected Long compileId ;
+	protected Integer compileId ;
 	/**
 	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
 	 *
@@ -696,13 +696,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 * @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;
 	}
 	/* (non-Javadoc)