From 9d552fa8d3d743ca3c5b1f64c9e75a6e23583e0f Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 12 Jun 2018 13:32:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=85=AC=E5=85=B1=E7=B1=BB?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/log/BaseLogEntity.java     | 24 +++++++++++++++++++
 .../log/ntc/LogChartController.java           |  4 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/domain/log/BaseLogEntity.java b/src/main/java/com/nis/domain/log/BaseLogEntity.java
index a8fb99cb0..994373620 100644
--- a/src/main/java/com/nis/domain/log/BaseLogEntity.java
+++ b/src/main/java/com/nis/domain/log/BaseLogEntity.java
@@ -29,6 +29,30 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 	private String nestAddrList; //嵌套地址列表
 	private String userRegion; //用户自定义
 	
+	//自定义字段
+	protected String seltype;//选中类型,页面搜索用
+	protected String searchFoundStartTime;//开始时间，格式为yyyy-mm-dd hh24:mi:ss
+	protected String searchFoundendTime;//结束时间，格式同上
+	
+	
+	public String getSearchFoundStartTime() {
+		return searchFoundStartTime;
+	}
+	public void setSearchFoundStartTime(String searchFoundStartTime) {
+		this.searchFoundStartTime = searchFoundStartTime;
+	}
+	public String getSearchFoundendTime() {
+		return searchFoundendTime;
+	}
+	public void setSearchFoundendTime(String searchFoundendTime) {
+		this.searchFoundendTime = searchFoundendTime;
+	}
+	public String getSeltype() {
+		return seltype;
+	}
+	public void setSeltype(String seltype) {
+		this.seltype = seltype;
+	}
 	public Integer getCfgId() {
 		return cfgId;
 	}
diff --git a/src/main/java/com/nis/web/controller/log/ntc/LogChartController.java b/src/main/java/com/nis/web/controller/log/ntc/LogChartController.java
index 317979c60..6bb5118c7 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/LogChartController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/LogChartController.java
@@ -6,12 +6,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.nis.web.controller.BaseController;
 @Controller
-@RequestMapping(value = "/logs")
+@RequestMapping(value = "/log")
 public class LogChartController extends BaseController{
 	@RequestMapping(value="logChart")
 	public String logChart(){
 		
-		return "/logs/chart";
+		return "/log/chart";
 	}
 	@RequestMapping(value="ajaxChart")
 	@ResponseBody