1:新增业务

2:为url和关键字业务添加url和website查询条件

src/main/java/com/nis/domain/restful/NtcHttpLog.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;
 
@@ -40,7 +41,8 @@ public class NtcHttpLog extends LogEntity {
     @ApiModelProperty(value="应答体转储文件KEY", required=true)
     protected String resBodyKey;
     
-    protected String searchUrl; //命中url
+    protected String searchUrl; //url查询条件
+    protected String searchWebsite; //website查询条件
     public String getUrl() {
         return url;
     }
@@ -130,6 +132,8 @@ public class NtcHttpLog extends LogEntity {
 	/**
 	 * @return the searchUrl
 	 */
+
+	@JsonIgnore
 	public String getSearchUrl() {
 		return searchUrl;
 	}
@@ -140,4 +144,16 @@ public class NtcHttpLog extends LogEntity {
 	public void setSearchUrl(String searchUrl) {
 		this.searchUrl = searchUrl;
 	}
+
+	@JsonIgnore
+	public String getSearchWebsite() {
+		return searchWebsite;
+	}
+
+	public void setSearchWebsite(String searchWebsite) {
+		this.searchWebsite = searchWebsite;
+	}
+	
+	
+	
 }

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

@@ -1,5 +1,6 @@
 package com.nis.domain.restful;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nis.domain.LogEntity;
 
 public class NtcKeywordsUrlLog extends LogEntity<NtcKeywordsUrlLog> {
@@ -10,6 +11,8 @@ public class NtcKeywordsUrlLog extends LogEntity<NtcKeywordsUrlLog> {
 	private static final long serialVersionUID = 1L;
 	private String url;
 	private String website;
+	protected String searchUrl; // url查询条件
+	protected String searchWebsite; // website查询条件
 
 	public String getUrl() {
 		return url;
@@ -27,4 +30,25 @@ public class NtcKeywordsUrlLog extends LogEntity<NtcKeywordsUrlLog> {
 		this.website = website;
 	}
 
+	@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;
+	}
+
 }

src/main/java/com/nis/web/service/LogDataService.java

@@ -228,7 +228,7 @@ public class LogDataService {
 								String type = filedsType.get(key).trim();
 								if (type.equals("java.lang.String")) {
 									String field = filedAndColumnMap.get(key).toLowerCase();
-									if (field.equals("url")) {
+									if (field.equals("url")||field.equals("website")) {
 										whereSB.append(" and " + field + " like '" + value.toString().trim() + "%'");
 									} else {
 										whereSB.append(" and " + field + "='"