动态首页补充数据提交

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

@@ -3,6 +3,7 @@ package com.nis.domain.restful;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -36,6 +37,48 @@ public class DropInfo implements Serializable {
 	@ApiModelProperty(value = "统计时间")
 	private Date reportTime;// 五分钟统计时间
 
+	private long baseNum;
+	private String searchReportStartTime;
+	private String searchReportEndTime;
+	private int searchBusinessType;
+
+
+	@JsonIgnore
+	public int getSearchBusinessType() {
+		return searchBusinessType;
+	}
+
+	public void setSearchBusinessType(int searchBusinessType) {
+		this.searchBusinessType = searchBusinessType;
+	}
+
+	@JsonIgnore
+	public String getSearchReportStartTime() {
+		return searchReportStartTime;
+	}
+
+	public void setSearchReportStartTime(String searchReportStartTime) {
+		this.searchReportStartTime = searchReportStartTime;
+	}
+
+	@JsonIgnore
+	public String getSearchReportEndTime() {
+		return searchReportEndTime;
+	}
+
+	public void setSearchReportEndTime(String searchReportEndTime) {
+		this.searchReportEndTime = searchReportEndTime;
+	}
+
+	@JsonIgnore
+	public long getBaseNum() {
+		return baseNum;
+	}
+
+	public void setBaseNum(long baseNum) {
+		this.baseNum = baseNum;
+	}
+	
 	public String getLabel() {
 		return label;
 	}

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

@@ -6,6 +6,7 @@ import java.util.Date;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat.ISO;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -41,7 +42,38 @@ public class NtcAreaHomeReport implements Serializable {
 
 	@JsonInclude(value = Include.NON_NULL)
 	@ApiModelProperty(value = "统计时间")
-	private Date reportTime;// 统计时间
+	private Date reportTime;// 统计时间	
+
+	private long baseNum;
+	private String searchReportStartTime;
+	private String searchReportEndTime;
+
+	@JsonIgnore
+	public String getSearchReportStartTime() {
+		return searchReportStartTime;
+	}
+
+	public void setSearchReportStartTime(String searchReportStartTime) {
+		this.searchReportStartTime = searchReportStartTime;
+	}
+
+	@JsonIgnore
+	public String getSearchReportEndTime() {
+		return searchReportEndTime;
+	}
+
+	public void setSearchReportEndTime(String searchReportEndTime) {
+		this.searchReportEndTime = searchReportEndTime;
+	}
+
+	@JsonIgnore
+	public long getBaseNum() {
+		return baseNum;
+	}
+
+	public void setBaseNum(long baseNum) {
+		this.baseNum = baseNum;
+	}
 
 	public int getEntranceId() {
 		return entranceId;

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

@@ -1,5 +1,6 @@
 package com.nis.domain.restful;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nis.domain.LogEntity;
 import com.wordnik.swagger.annotations.ApiModelProperty;
 
@@ -42,6 +43,8 @@ public class PxyHttpLog  extends LogEntity<PxyHttpLog> {
     @ApiModelProperty(value="域名", required=true)
     protected String website;
     
+    protected String searchUrl; //url查询条件a
+    protected String searchWebsite; //website查询条件
 	public String getUrl() {
 		return url;
 	}
@@ -127,4 +130,29 @@ public class PxyHttpLog  extends LogEntity<PxyHttpLog> {
 	public void setWebsite(String website) {
 		this.website = website;
 	}
+	
+	/**
+	 * @return the searchUrl
+	 */
+
+	@JsonIgnore
+	public String getSearchUrl() {
+		return searchUrl;
+	}
+	
+	/**
+	 * @param searchUrl the searchUrl to set
+	 */
+	public void setSearchUrl(String searchUrl) {
+		this.searchUrl = searchUrl;
+	}
+
+	@JsonIgnore
+	public String getSearchWebsite() {
+		return searchWebsite;
+	}
+
+	public void setSearchWebsite(String searchWebsite) {
+		this.searchWebsite = searchWebsite;
+	}
 }