事件报表 1.筛选条件增加时间范围的限制和专项的下拉列表选择2.增加默认的查询时间范围

监测封堵(七天),重点保障(30天)用来查询和导出3.增加了国际化文件

src/main/java/com/nis/domain/report/NtcEventKeyProtectionReport.java

@@ -2,6 +2,7 @@ package com.nis.domain.report;
 
 import java.util.Date;
 
+import com.nis.domain.BaseEntity;
 import com.nis.util.excel.ExcelField;
 
 /**
@@ -10,14 +11,14 @@ import com.nis.util.excel.ExcelField;
  * @author A.Chen
  *
  */
-public class NtcEventKeyProtectionReport {
+public class NtcEventKeyProtectionReport extends BaseEntity<NtcEventKeyProtectionReport> {
 
 	/**
 	 * 
 	 */
 
 	@ExcelField(title = "task_id", sort = 1)
-	private String taskId;
+	private String taskIds;
 
 	@ExcelField(title = "task_name", sort = 2)
 	private String taskName;
@@ -125,12 +126,12 @@ public class NtcEventKeyProtectionReport {
 		this.searchTaskEndTime = searchTaskEndTime;
 	}
 
-	public String getTaskId() {
+	public String getTaskIds() {
-		return taskId;
+		return taskIds;
 	}
 
-	public void setTaskId(String taskId) {
+	public void setTaskIds(String taskIds) {
-		this.taskId = taskId;
+		this.taskIds = taskIds;
 	}
 
 	public String getReportTime() {
@@ -143,9 +144,9 @@ public class NtcEventKeyProtectionReport {
 
 	@Override
 	public String toString() {
-		return "NtcEventKeyProtectionReport [taskTime=" + taskTime + ", taskName=" + taskName + ", letterNum="
+		return "NtcEventKeyProtectionReport [taskIds=" + taskIds + ", taskName=" + taskName + ", letterNum=" + letterNum
-				+ letterNum + ", configNum=" + configNum + ", monitorNum=" + monitorNum + ", controlNum=" + controlNum
+				+ ", configNum=" + configNum + ", monitorNum=" + monitorNum + ", controlNum=" + controlNum
-				+ ", taskId=" + taskId + ", reportTime=" + reportTime + ", searchReportStartTime="
+				+ ", taskTime=" + taskTime + ", reportTime=" + reportTime + ", searchReportStartTime="
 				+ searchReportStartTime + ", searchReportEndTime=" + searchReportEndTime + ", searchTaskStartTime="
 				+ searchTaskStartTime + ", searchTaskEndTime=" + searchTaskEndTime + "]";
 	}

src/main/java/com/nis/domain/report/NtcEventMonitorOrBlockReport.java

@@ -1,5 +1,6 @@
 package com.nis.domain.report;
 
+import com.nis.domain.BaseEntity;
 import com.nis.util.excel.ExcelField;
 
 /**
@@ -8,7 +9,12 @@ import com.nis.util.excel.ExcelField;
  * @author A.Chen
  *
  */
-public class NtcEventMonitorOrBlockReport {
+public class NtcEventMonitorOrBlockReport extends BaseEntity<NtcEventMonitorOrBlockReport> {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4523581081780227829L;
+
 	@ExcelField(title = "task_time", sort = 8)
 	private String taskTime;// 审核时间
 
@@ -31,7 +37,7 @@ public class NtcEventMonitorOrBlockReport {
 	private long agentNum;// 代理次数
 
 	@ExcelField(title = "task_id", sort = 1)
-	private String taskId;// 审核ID
+	private String taskIds;// 审核ID
 
 	@ExcelField(title = "stat_time", sort = 9)
 	private String reportTime;// 统计时间
@@ -147,21 +153,21 @@ public class NtcEventMonitorOrBlockReport {
 		this.reportType = reportType;
 	}
 
-	public String getTaskId() {
+	public String getTaskIds() {
-		return taskId;
+		return taskIds;
 	}
 
-	public void setTaskId(String taskId) {
+	public void setTaskIds(String taskIds) {
-		this.taskId = taskId;
+		this.taskIds = taskIds;
 	}
 
 	@Override
 	public String toString() {
 		return "NtcEventMonitorOrBlockReport [taskTime=" + taskTime + ", taskName=" + taskName + ", ipNum=" + ipNum
 				+ ", httpNum=" + httpNum + ", mailNum=" + mailNum + ", vedioNum=" + vedioNum + ", agentNum=" + agentNum
-				+ ", searchReportStartTime=" + searchReportStartTime + ", searchReportEndTime=" + searchReportEndTime
+				+ ", taskIds=" + taskIds + ", reportTime=" + reportTime + ", searchReportStartTime="
-				+ ", searchTaskStartTime=" + searchTaskStartTime + ", searchTaskEndTime=" + searchTaskEndTime
+				+ searchReportStartTime + ", searchReportEndTime=" + searchReportEndTime + ", searchTaskStartTime="
-				+ ", reportType=" + reportType + ", taskId=" + taskId + ", reportTime=" + reportTime + "]";
+				+ searchTaskStartTime + ", searchTaskEndTime=" + searchTaskEndTime + ", reportType=" + reportType + "]";
 	}
 
 }

src/main/java/com/nis/web/controller/report/NtcEventBlockController.java

@@ -1,6 +1,9 @@
 package com.nis.web.controller.report;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -10,6 +13,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -21,16 +28,24 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
+import com.nis.domain.configuration.TaskInfo;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.domain.report.NtcEventMonitorOrBlockReport;
 import com.nis.util.Constants;
+import com.nis.util.TimeConstants;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
+import com.nis.web.service.basics.TaskInfoService;
 
 @Controller
 @RequestMapping("${adminPath}/eventBlock")
 public class NtcEventBlockController extends BaseController {
 
+	protected static Logger logger = LoggerFactory.getLogger(NtcEventBlockController.class);
+	
+	@Autowired
+	private TaskInfoService taskInfoService;
+
 	/**
 	 * EventBlock
 	 * 
@@ -50,31 +65,39 @@ public class NtcEventBlockController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 
 			// 判断请求参数
-			if (StringUtils.isNotBlank(log.getSearchReportStartTime())
+			String searchReportStartTime = null;
-					&& StringUtils.isNotBlank(log.getSearchReportEndTime())) {
+			String searchReportEndTime = null;
-				params.put("searchReportStartTime", log.getSearchReportStartTime());
+			String searchTaskStartTime = null;
-				params.put("searchReportEndTime", log.getSearchReportEndTime());
+			String searchTaskEndTime = null;
-			}
 
-			if (StringUtils.isNotBlank(log.getSearchTaskStartTime())
+			/**
-					&& StringUtils.isNotBlank(log.getSearchTaskEndTime())) {
+			 * 对统计时间参数进行处理 开始-结束(一周内[7天])
-				params.put("searchTaskStartTime", log.getSearchTaskStartTime());
+			 */
-				params.put("searchTaskEndTime", log.getSearchTaskEndTime());
+			String[] serachReportTimes = getSerachTimes(log.getSearchReportStartTime(), log.getSearchReportEndTime());
-			}
+			searchReportStartTime = serachReportTimes[0];
+			searchReportEndTime = serachReportTimes[1];
 
-			if (StringUtils.isNotBlank(log.getTaskName())) {
+			/**
-				params.put("taskName", log.getTaskName());
+			 * 对报送时间参数进行处理 开始-结束(一周内[7天])
-			}
+			 */
+			String[] serachTaskTimes = getSerachTimes(log.getSearchTaskStartTime(), log.getSearchTaskEndTime());
+			searchTaskStartTime = serachTaskTimes[0];
+			searchTaskEndTime = serachTaskTimes[1];
 
-			if (StringUtils.isNotBlank(log.getTaskId())) {
+			params.put("searchReportStartTime", searchReportStartTime);
-				params.put("taskId", log.getTaskId());
+			params.put("searchReportEndTime", searchReportEndTime);
+			params.put("searchTaskStartTime", searchTaskStartTime);
+			params.put("searchTaskEndTime", searchTaskEndTime);
+
+
+			if (StringUtils.isNotBlank(log.getTaskIds())) {
+				params.put("taskIds", log.getTaskIds());
 			}
 
 			params.put("reportType", 1);
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report;
-			// String url =
+//			String url = "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
-			// "http://192.168.11.56:8080/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock?reportType=1";
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			if (StringUtils.isNotBlank(recv)) {
 				Gson gson = new GsonBuilder().create();
@@ -87,6 +110,9 @@ public class NtcEventBlockController extends BaseController {
 					page.setLast(data.getLast());
 					page.setList(data.getList());
 					model.addAttribute("page", page);
+					// 获取专项列表
+					List<TaskInfo> taskList = taskInfoService.findTaskInfo(new TaskInfo());
+					model.addAttribute("taskList", taskList);
 				}
 			}
 		} catch (Exception e) {
@@ -114,32 +140,46 @@ public class NtcEventBlockController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 
+			
 			// 判断请求参数
-			if (StringUtils.isNotBlank(log.getSearchReportStartTime())
+			String searchReportStartTime = null;
-					&& StringUtils.isNotBlank(log.getSearchReportEndTime())) {
+			String searchReportEndTime = null;
-				params.put("searchReportStartTime", log.getSearchReportStartTime());
+			String searchTaskStartTime = null;
-				params.put("searchReportEndTime", log.getSearchReportEndTime());
+			String searchTaskEndTime = null;
+
+			/**
+			 * 对统计时间参数进行处理 开始-结束(一周内[7天])
+			 */
+			String[] serachReportTimes = getSerachTimes(log.getSearchReportStartTime(), log.getSearchReportEndTime());
+			searchReportStartTime = serachReportTimes[0];
+			searchReportEndTime = serachReportTimes[1];
+
+			/**
+			 * 对报送时间参数进行处理 开始-结束(一周内[7天])
+			 */
+			String[] serachTaskTimes = getSerachTimes(log.getSearchTaskStartTime(), log.getSearchTaskEndTime());
+			searchTaskStartTime = serachTaskTimes[0];
+			searchTaskEndTime = serachTaskTimes[1];
+
+			params.put("searchReportStartTime", searchReportStartTime);
+			params.put("searchReportEndTime", searchReportEndTime);
+			params.put("searchTaskStartTime", searchTaskStartTime);
+			params.put("searchTaskEndTime", searchTaskEndTime);
+			
+
+			if (StringUtils.isNotBlank(log.getTaskIds())) {
+				params.put("taskIds", log.getTaskIds());
 			}
 
-			if (StringUtils.isNotBlank(log.getSearchTaskStartTime())
+			log.setSearchReportStartTime(searchReportStartTime);
-					&& StringUtils.isNotBlank(log.getSearchTaskEndTime())) {
+			log.setSearchReportEndTime(searchReportEndTime);
-				params.put("searchTaskStartTime", log.getSearchTaskStartTime());
+			log.setSearchTaskStartTime(searchTaskStartTime);
-				params.put("searchTaskEndTime", log.getSearchTaskEndTime());
+			log.setSearchTaskEndTime(searchTaskEndTime);
-			}
-
-			if (StringUtils.isNotBlank(log.getTaskName())) {
-				params.put("taskName", log.getTaskName());
-			}
-
-			if (StringUtils.isNotBlank(log.getTaskId())) {
-				params.put("taskId", log.getTaskId());
-			}
 			
 			params.put("reportType", 1);
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report;
-			// String url =
+//			String url = "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
-			// "http://192.168.11.56:8080/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock?reportType=1";
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			List<NtcEventMonitorOrBlockReport> list = new ArrayList<>();
 			if (StringUtils.isNotBlank(recv)) {
@@ -180,7 +220,7 @@ public class NtcEventBlockController extends BaseController {
 			ntcEventMonitorOrBlockReport.setMailNum(mailNum);
 			ntcEventMonitorOrBlockReport.setVedioNum(vedioNum);
 			ntcEventMonitorOrBlockReport.setAgentNum(agentNum);
-			ntcEventMonitorOrBlockReport.setTaskId(report_total);
+			ntcEventMonitorOrBlockReport.setTaskIds(report_total);
 			ntcEventMonitorOrBlockReport.setTaskName("　　　　一　　　");
 			ntcEventMonitorOrBlockReport.setTaskTime("　　　　一　　　");
 			ntcEventMonitorOrBlockReport.setReportTime("　　　　一　　　");
@@ -217,12 +257,72 @@ public class NtcEventBlockController extends BaseController {
 		}
 
 		if (StringUtils.isNotBlank(log.getSearchTaskStartTime())) {
-			logTime += "  " + msgProp.getProperty("task_begin_time") + "：" + log.getSearchTaskStartTime();
+			logTime += "  " + msgProp.getProperty("task_time") + "：" + log.getSearchTaskStartTime();
 		}
 
 		if (StringUtils.isNotBlank(log.getSearchTaskEndTime())) {
-			logTime += "  " + msgProp.getProperty("task_end_time") + "：" + log.getSearchTaskEndTime();
+			logTime += "  " + msgProp.getProperty("task_time") + "：" + log.getSearchTaskEndTime();
 		}
 		return logTime;
 	}
+
+	/**
+	 * 用来判断界面传来的时间参数是否为空来决定默认值与否
+	 * 
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	public String[] getSerachTimes(String startTime, String endTime) {
+		String[] times = new String[2];
+		if (StringUtils.isNotBlank(startTime)) {
+			times[0] = startTime;
+			if (StringUtils.isNotBlank(endTime)) {
+				times[1] = endTime;
+			} else {
+				times[1] = getSomeDate(startTime, 7);
+			}
+		} else {
+			if (StringUtils.isNotBlank(endTime)) {
+				times[0] = getSomeDate(endTime, -7);
+				times[1] = endTime;
+			} else {
+				String searchReportEndTime = getCurrentDate();
+				times[0] = getSomeDate(searchReportEndTime, -7);
+				times[1] = searchReportEndTime;
+			}
+		}
+		return times;
+	}
+
+	/**
+	 * 对日期Day的加/减
+	 * 
+	 * @param date
+	 * @param offset
+	 * @return
+	 */
+	public static String getSomeDate(String date, int offset) {
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date time = null;
+		try {
+			time = format.parse(date);
+		} catch (ParseException e) {
+			logger.error("日期格式转换出现异常,{}", e);
+		}
+		DateTime dateTime = new DateTime(time);
+		return dateTime.plusDays(offset).toString(TimeConstants.YYYY_MM_DD_HH24_MM_SS);
+	}
+
+	/**
+	 * 得到当前时间
+	 * 
+	 * @return
+	 */
+	public static String getCurrentDate() {
+
+		DateTime dateTime = DateTime.now();
+
+		return dateTime.toString(TimeConstants.YYYY_MM_DD_HH24_MM_SS);
+	}
 }

src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java

@@ -1,6 +1,9 @@
 package com.nis.web.controller.report;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -10,6 +13,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -21,16 +28,25 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
+import com.nis.domain.configuration.TaskInfo;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.domain.report.NtcEventKeyProtectionReport;
+import com.nis.domain.report.NtcEventMonitorOrBlockReport;
 import com.nis.util.Constants;
+import com.nis.util.TimeConstants;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
+import com.nis.web.service.basics.TaskInfoService;
 
 @Controller
 @RequestMapping("${adminPath}/eventKeyProtection")
 public class NtcEventKeyProtectionController extends BaseController {
 
+	protected static Logger logger = LoggerFactory.getLogger(NtcEventKeyProtectionController.class);
+
+	@Autowired
+	private TaskInfoService taskInfoService;
+
 	/**
 	 * EventBlock
 	 * 
@@ -50,29 +66,37 @@ public class NtcEventKeyProtectionController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 
 			// 判断请求参数
-			if (StringUtils.isNotBlank(log.getSearchReportStartTime())
+			String searchReportStartTime = null;
-					&& StringUtils.isNotBlank(log.getSearchReportEndTime())) {
+			String searchReportEndTime = null;
-				params.put("searchReportStartTime", log.getSearchReportStartTime());
+			String searchTaskStartTime = null;
-				params.put("searchReportEndTime", log.getSearchReportEndTime());
+			String searchTaskEndTime = null;
-			}
 
-			if (StringUtils.isNotBlank(log.getSearchTaskStartTime())
+			/**
-					&& StringUtils.isNotBlank(log.getSearchTaskEndTime())) {
+			 * 对统计时间参数进行处理 开始-结束(一周内[7天])
-				params.put("searchTaskStartTime", log.getSearchTaskStartTime());
+			 */
-				params.put("searchTaskEndTime", log.getSearchTaskEndTime());
+			String[] serachReportTimes = getSerachTimes(log.getSearchReportStartTime(), log.getSearchReportEndTime());
-			}
+			searchReportStartTime = serachReportTimes[0];
+			searchReportEndTime = serachReportTimes[1];
 
-			if (StringUtils.isNotBlank(log.getTaskName())) {
+			/**
-				params.put("taskName", log.getTaskName());
+			 * 对报送时间参数进行处理 开始-结束(一周内[7天])
-			}
+			 */
+			String[] serachTaskTimes = getSerachTimes(log.getSearchTaskStartTime(), log.getSearchTaskEndTime());
+			searchTaskStartTime = serachTaskTimes[0];
+			searchTaskEndTime = serachTaskTimes[1];
 
-			if (StringUtils.isNotBlank(log.getTaskId())) {
+			params.put("searchReportStartTime", searchReportStartTime);
-				params.put("taskId", log.getTaskId());
+			params.put("searchReportEndTime", searchReportEndTime);
+			params.put("searchTaskStartTime", searchTaskStartTime);
+			params.put("searchTaskEndTime", searchTaskEndTime);
+
+			if (StringUtils.isNotBlank(log.getTaskIds())) {
+				params.put("taskIds", log.getTaskIds());
 			}
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report;
 			// String url =
-			// "http://192.168.11.56:8080/galaxy-service/service/log/v1/ntcEventKeyProtection";
+			// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventKeyProtection";
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			if (StringUtils.isNotBlank(recv)) {
 				Gson gson = new GsonBuilder().create();
@@ -85,6 +109,9 @@ public class NtcEventKeyProtectionController extends BaseController {
 					page.setLast(data.getLast());
 					page.setList(data.getList());
 					model.addAttribute("page", page);
+					// 获取专项列表
+					List<TaskInfo> taskList = taskInfoService.findTaskInfo(new TaskInfo());
+					model.addAttribute("taskList", taskList);
 				}
 			}
 		} catch (Exception e) {
@@ -113,29 +140,42 @@ public class NtcEventKeyProtectionController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 
 			// 判断请求参数
-			if (StringUtils.isNotBlank(log.getSearchReportStartTime())
+			String searchReportStartTime = null;
-					&& StringUtils.isNotBlank(log.getSearchReportEndTime())) {
+			String searchReportEndTime = null;
-				params.put("searchReportStartTime", log.getSearchReportStartTime());
+			String searchTaskStartTime = null;
-				params.put("searchReportEndTime", log.getSearchReportEndTime());
+			String searchTaskEndTime = null;
+
+			/**
+			 * 对统计时间参数进行处理 开始-结束(一周内[7天])
+			 */
+			String[] serachReportTimes = getSerachTimes(log.getSearchReportStartTime(), log.getSearchReportEndTime());
+			searchReportStartTime = serachReportTimes[0];
+			searchReportEndTime = serachReportTimes[1];
+
+			/**
+			 * 对报送时间参数进行处理 开始-结束(一周内[7天])
+			 */
+			String[] serachTaskTimes = getSerachTimes(log.getSearchTaskStartTime(), log.getSearchTaskEndTime());
+			searchTaskStartTime = serachTaskTimes[0];
+			searchTaskEndTime = serachTaskTimes[1];
+
+			params.put("searchReportStartTime", searchReportStartTime);
+			params.put("searchReportEndTime", searchReportEndTime);
+			params.put("searchTaskStartTime", searchTaskStartTime);
+			params.put("searchTaskEndTime", searchTaskEndTime);
+
+			if (StringUtils.isNotBlank(log.getTaskIds())) {
+				params.put("taskIds", log.getTaskIds());
 			}
 
-			if (StringUtils.isNotBlank(log.getSearchTaskStartTime())
+			log.setSearchReportStartTime(searchReportStartTime);
-					&& StringUtils.isNotBlank(log.getSearchTaskEndTime())) {
+			log.setSearchReportEndTime(searchReportEndTime);
-				params.put("searchTaskStartTime", log.getSearchTaskStartTime());
+			log.setSearchTaskStartTime(searchTaskStartTime);
-				params.put("searchTaskEndTime", log.getSearchTaskEndTime());
+			log.setSearchTaskEndTime(searchTaskEndTime);
-			}
-
-			if (StringUtils.isNotBlank(log.getTaskName())) {
-				params.put("taskName", log.getTaskName());
-			}
-
-			if (StringUtils.isNotBlank(log.getTaskId())) {
-				params.put("taskId", log.getTaskId());
-			}
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report;
 			// String url =
-			// "http://192.168.11.56:8080/galaxy-service/service/log/v1/ntcEventKeyProtection";
+			// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventKeyProtection";
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			List<NtcEventKeyProtectionReport> list = new ArrayList<>();
 			if (StringUtils.isNotBlank(recv)) {
@@ -173,7 +213,7 @@ public class NtcEventKeyProtectionController extends BaseController {
 			ntcEventKeyProtectionReport.setConfigNum(configNum);
 			ntcEventKeyProtectionReport.setMonitorNum(monitorNum);
 			ntcEventKeyProtectionReport.setControlNum(controlNum);
-			ntcEventKeyProtectionReport.setTaskId(report_total);
+			ntcEventKeyProtectionReport.setTaskIds(report_total);
 			ntcEventKeyProtectionReport.setTaskName(" 　　　　一 　　　　");
 			ntcEventKeyProtectionReport.setTaskTime(" 　　　　一 　　　　");
 			ntcEventKeyProtectionReport.setReportTime(" 　　　一　　　　 ");
@@ -210,12 +250,72 @@ public class NtcEventKeyProtectionController extends BaseController {
 		}
 
 		if (StringUtils.isNotBlank(log.getSearchTaskStartTime())) {
-			logTime += "  " + msgProp.getProperty("task_begin_time") + "：" + log.getSearchTaskStartTime();
+			logTime += "  " + msgProp.getProperty("task_time") + "：" + log.getSearchTaskStartTime();
 		}
 
 		if (StringUtils.isNotBlank(log.getSearchTaskEndTime())) {
-			logTime += "  " + msgProp.getProperty("task_end_time") + "：" + log.getSearchTaskEndTime();
+			logTime += "  " + msgProp.getProperty("task_time") + "：" + log.getSearchTaskEndTime();
 		}
 		return logTime;
 	}
+
+	/**
+	 * 用来判断界面传来的时间参数是否为空来决定默认值与否
+	 * 
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	public String[] getSerachTimes(String startTime, String endTime) {
+		String[] times = new String[2];
+		if (StringUtils.isNotBlank(startTime)) {
+			times[0] = startTime;
+			if (StringUtils.isNotBlank(endTime)) {
+				times[1] = endTime;
+			} else {
+				times[1] = getSomeDate(startTime, 7);
+			}
+		} else {
+			if (StringUtils.isNotBlank(endTime)) {
+				times[0] = getSomeDate(endTime, -7);
+				times[1] = endTime;
+			} else {
+				String searchReportEndTime = getCurrentDate();
+				times[0] = getSomeDate(searchReportEndTime, -7);
+				times[1] = searchReportEndTime;
+			}
+		}
+		return times;
+	}
+
+	/**
+	 * 对日期Day的加/减
+	 * 
+	 * @param date
+	 * @param offset
+	 * @return
+	 */
+	public static String getSomeDate(String date, int offset) {
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date time = null;
+		try {
+			time = format.parse(date);
+		} catch (ParseException e) {
+			logger.error("日期格式转换出现异常,{}", e);
+		}
+		DateTime dateTime = new DateTime(time);
+		return dateTime.plusDays(offset).toString(TimeConstants.YYYY_MM_DD_HH24_MM_SS);
+	}
+
+	/**
+	 * 得到当前时间
+	 * 
+	 * @return
+	 */
+	public static String getCurrentDate() {
+
+		DateTime dateTime = DateTime.now();
+
+		return dateTime.toString(TimeConstants.YYYY_MM_DD_HH24_MM_SS);
+	}
 }

src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java

@@ -1,7 +1,11 @@
 package com.nis.web.controller.report;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -11,6 +15,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -22,18 +30,27 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
+import com.nis.domain.configuration.TaskInfo;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.domain.report.BaseReport;
 import com.nis.domain.report.NtcEventMonitorOrBlockReport;
 import com.nis.domain.report.NtcURLReport;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
+import com.nis.util.TimeConstants;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
+import com.nis.web.service.basics.TaskInfoService;
 
 @Controller
 @RequestMapping("${adminPath}/eventMonitor")
 public class NtcEventMonitorController extends BaseController {
+
+	protected static Logger logger = LoggerFactory.getLogger(NtcEventMonitorController.class);
+
+	@Autowired
+	private TaskInfoService taskInfoService;
+
 	/**
 	 * EventMonitor
 	 * 
@@ -53,31 +70,39 @@ public class NtcEventMonitorController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 
 			// 判断请求参数
-			if (StringUtils.isNotBlank(log.getSearchReportStartTime())
+			String searchReportStartTime = null;
-					&& StringUtils.isNotBlank(log.getSearchReportEndTime())) {
+			String searchReportEndTime = null;
-				params.put("searchReportStartTime", log.getSearchReportStartTime());
+			String searchTaskStartTime = null;
-				params.put("searchReportEndTime", log.getSearchReportEndTime());
+			String searchTaskEndTime = null;
-			}
 
-			if (StringUtils.isNotBlank(log.getSearchTaskStartTime())
+			/**
-					&& StringUtils.isNotBlank(log.getSearchTaskEndTime())) {
+			 * 对统计时间参数进行处理 开始-结束(一周内[7天])
-				params.put("searchTaskStartTime", log.getSearchTaskStartTime());
+			 */
-				params.put("searchTaskEndTime", log.getSearchTaskEndTime());
+			String[] serachReportTimes = getSerachTimes(log.getSearchReportStartTime(), log.getSearchReportEndTime());
-			}
+			searchReportStartTime = serachReportTimes[0];
+			searchReportEndTime = serachReportTimes[1];
 
-			if (StringUtils.isNotBlank(log.getTaskName())) {
+			/**
-				params.put("taskName", log.getTaskName());
+			 * 对报送时间参数进行处理 开始-结束(一周内[7天])
-			}
+			 */
+			String[] serachTaskTimes = getSerachTimes(log.getSearchTaskStartTime(), log.getSearchTaskEndTime());
+			searchTaskStartTime = serachTaskTimes[0];
+			searchTaskEndTime = serachTaskTimes[1];
 
-			if (StringUtils.isNotBlank(log.getTaskId())) {
+			params.put("searchReportStartTime", searchReportStartTime);
-				params.put("taskId", log.getTaskId());
+			params.put("searchReportEndTime", searchReportEndTime);
+			params.put("searchTaskStartTime", searchTaskStartTime);
+			params.put("searchTaskEndTime", searchTaskEndTime);
+
+			if (StringUtils.isNotBlank(log.getTaskIds())) {
+				params.put("taskIds", log.getTaskIds());
 			}
 
 			params.put("reportType", 2);
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report;
 			// String url =
-			// "http://192.168.11.56:8080/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock?reportType=2";
+			// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			if (StringUtils.isNotBlank(recv)) {
 				Gson gson = new GsonBuilder().create();
@@ -90,6 +115,9 @@ public class NtcEventMonitorController extends BaseController {
 					page.setLast(data.getLast());
 					page.setList(data.getList());
 					model.addAttribute("page", page);
+					// 获取专项列表
+					List<TaskInfo> taskList = taskInfoService.findTaskInfo(new TaskInfo());
+					model.addAttribute("taskList", taskList);
 				}
 			}
 		} catch (Exception e) {
@@ -118,31 +146,44 @@ public class NtcEventMonitorController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 
 			// 判断请求参数
-			if (StringUtils.isNotBlank(log.getSearchReportStartTime())
+			String searchReportStartTime = null;
-					&& StringUtils.isNotBlank(log.getSearchReportEndTime())) {
+			String searchReportEndTime = null;
-				params.put("searchReportStartTime", log.getSearchReportStartTime());
+			String searchTaskStartTime = null;
-				params.put("searchReportEndTime", log.getSearchReportEndTime());
+			String searchTaskEndTime = null;
+
+			/**
+			 * 对统计时间参数进行处理 开始-结束(一周内[7天])
+			 */
+			String[] serachReportTimes = getSerachTimes(log.getSearchReportStartTime(), log.getSearchReportEndTime());
+			searchReportStartTime = serachReportTimes[0];
+			searchReportEndTime = serachReportTimes[1];
+
+			/**
+			 * 对报送时间参数进行处理 开始-结束(一周内[7天])
+			 */
+			String[] serachTaskTimes = getSerachTimes(log.getSearchTaskStartTime(), log.getSearchTaskEndTime());
+			searchTaskStartTime = serachTaskTimes[0];
+			searchTaskEndTime = serachTaskTimes[1];
+
+			params.put("searchReportStartTime", searchReportStartTime);
+			params.put("searchReportEndTime", searchReportEndTime);
+			params.put("searchTaskStartTime", searchTaskStartTime);
+			params.put("searchTaskEndTime", searchTaskEndTime);
+
+			if (StringUtils.isNotBlank(log.getTaskIds())) {
+				params.put("taskIds", log.getTaskIds());
 			}
 
-			if (StringUtils.isNotBlank(log.getSearchTaskStartTime())
+			log.setSearchReportStartTime(searchReportStartTime);
-					&& StringUtils.isNotBlank(log.getSearchTaskEndTime())) {
+			log.setSearchReportEndTime(searchReportEndTime);
-				params.put("searchTaskStartTime", log.getSearchTaskStartTime());
+			log.setSearchTaskStartTime(searchTaskStartTime);
-				params.put("searchTaskEndTime", log.getSearchTaskEndTime());
+			log.setSearchTaskEndTime(searchTaskEndTime);
-			}
-
-			if (StringUtils.isNotBlank(log.getTaskName())) {
-				params.put("taskName", log.getTaskName());
-			}
-
-			if (StringUtils.isNotBlank(log.getTaskId())) {
-				params.put("taskId", log.getTaskId());
-			}
 
 			params.put("reportType", 2);
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report;
 			// String url =
-			// "http://192.168.11.56:8080/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock?reportType=2";
+			// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			List<NtcEventMonitorOrBlockReport> list = new ArrayList<>();
 			if (StringUtils.isNotBlank(recv)) {
@@ -155,7 +196,6 @@ public class NtcEventMonitorController extends BaseController {
 					list = data.getList();
 				}
 			}
-
 			//
 			titleList.add("ntc_event_monitor_report");
 			classMap.put("ntc_event_monitor_report", NtcEventMonitorOrBlockReport.class);
@@ -183,7 +223,7 @@ public class NtcEventMonitorController extends BaseController {
 			ntcEventMonitorOrBlockReport.setMailNum(mailNum);
 			ntcEventMonitorOrBlockReport.setVedioNum(vedioNum);
 			ntcEventMonitorOrBlockReport.setAgentNum(agentNum);
-			ntcEventMonitorOrBlockReport.setTaskId(report_total);
+			ntcEventMonitorOrBlockReport.setTaskIds(report_total);
 			ntcEventMonitorOrBlockReport.setTaskName("　　　　一　　　");
 			ntcEventMonitorOrBlockReport.setTaskTime("　　　　一　　　");
 			ntcEventMonitorOrBlockReport.setReportTime("　　　　一　　　");
@@ -220,12 +260,72 @@ public class NtcEventMonitorController extends BaseController {
 		}
 
 		if (StringUtils.isNotBlank(log.getSearchTaskStartTime())) {
-			logTime += "  " + msgProp.getProperty("task_begin_time") + "：" + log.getSearchTaskStartTime();
+			logTime += "  " + msgProp.getProperty("task_time") + "：" + log.getSearchTaskStartTime();
 		}
 
 		if (StringUtils.isNotBlank(log.getSearchTaskEndTime())) {
-			logTime += "  " + msgProp.getProperty("task_end_time") + "：" + log.getSearchTaskEndTime();
+			logTime += "  " + msgProp.getProperty("task_time") + "：" + log.getSearchTaskEndTime();
 		}
 		return logTime;
 	}
+
+	/**
+	 * 用来判断界面传来的时间参数是否为空来决定默认值与否
+	 * 
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	public String[] getSerachTimes(String startTime, String endTime) {
+		String[] times = new String[2];
+		if (StringUtils.isNotBlank(startTime)) {
+			times[0] = startTime;
+			if (StringUtils.isNotBlank(endTime)) {
+				times[1] = endTime;
+			} else {
+				times[1] = getSomeDate(startTime, 7);
+			}
+		} else {
+			if (StringUtils.isNotBlank(endTime)) {
+				times[0] = getSomeDate(endTime, -7);
+				times[1] = endTime;
+			} else {
+				String searchReportEndTime = getCurrentDate();
+				times[0] = getSomeDate(searchReportEndTime, -7);
+				times[1] = searchReportEndTime;
+			}
+		}
+		return times;
+	}
+
+	/**
+	 * 对日期Day的加/减
+	 * 
+	 * @param date
+	 * @param offset
+	 * @return
+	 */
+	public static String getSomeDate(String date, int offset) {
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date time = null;
+		try {
+			time = format.parse(date);
+		} catch (ParseException e) {
+			logger.error("日期格式转换出现异常,{}", e);
+		}
+		DateTime dateTime = new DateTime(time);
+		return dateTime.plusDays(offset).toString(TimeConstants.YYYY_MM_DD_HH24_MM_SS);
+	}
+
+	/**
+	 * 得到当前时间
+	 * 
+	 * @return
+	 */
+	public static String getCurrentDate() {
+
+		DateTime dateTime = DateTime.now();
+
+		return dateTime.toString(TimeConstants.YYYY_MM_DD_HH24_MM_SS);
+	}
 }

src/main/resources/messages/message_en.properties

@@ -1421,8 +1421,6 @@ ntc_event_monitor_report=Event Monitor Report
 ntc_event_block_report=Event Block Report
 ntc_event_key_protection_report=Event Key Protection Report
 task_id=Task ID
-task_begin_time=Task Begin Time
-task_end_time=Task End Time
 http_num=HTTP
 mail_num=MAIL
 vedio_count=VEDIO

src/main/webapp/WEB-INF/views/report/eventBlockList.jsp

@@ -36,17 +36,17 @@
 			}
 		});
 		//筛选功能
-//		filterActionInit();
+		filterActionInit();
 		
 		
-//	$("span[id^=close]").on("click",function(){
+	$("span[id^=close]").on("click",function(){
-//			var closeId=$(this).attr("id");
+			var closeId=$(this).attr("id");
-//			var openId=$(this).attr("id").replace("close","open");
+			var openId=$(this).attr("id").replace("close","open");
-//			$("#"+closeId).hide();
+			$("#"+closeId).hide();
-//			$("#"+openId).show();
+			$("#"+openId).show();
-//        	$("#"+closeId).parent().parent().next("tr").hide();
+       	$("#"+closeId).parent().parent().next("tr").hide();
-//		});
+		});
-//		ajaxConnPercent();
+		ajaxConnPercent();
 	});
 	
 </script>
@@ -68,44 +68,54 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 
+						<!-- 筛选按钮展开状态-->
+						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+						
 						<div class="col-md-12">
-                            <div class="pull-left">
+<!--                             <div class="pull-left"> -->
-								<div class="input-group">
+<!-- 								<div class="input-group"> -->
-                                    <div class="input-group-btn">
+<!--                                     <div class="input-group-btn"> -->
-										<span class="selectpicker form-control" ><spring:message code="task_id"/></span>
+<%-- 										<span class="selectpicker form-control" ><spring:message code="task_name"/></span> --%>
-                                   	</div>
+<!--                                    	</div> -->
-                                   	<input name="taskId" type="text" class="form-control Wdate input-medium" maxlength="20" value="${log.taskId}" />
+<%--                                    	<input name="taskName" type="text" class="form-control input-small" maxlength="20" value="${log.taskName }" /> --%>
-                          		</div> 
+<!--                           		</div>  -->
-                            </div>
+<!--                        		 </div> -->
+<!-- 							<div class="pull-left"> -->
+<!-- 								<div class="input-group"> -->
+<!--                                 	<div class="input-group-btn"> -->
+<%-- 										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span> --%>
+<!--                                    	</div> -->
+<!--                                    	<input name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" -->
+<%-- 										value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
+<!--                           		</div>  -->
+<!--                             </div> -->
+<!-- 							<div class="pull-left"> -->
+<!-- 								<div class="input-group"> -->
+<!--                                     <div class="input-group-btn"> -->
+<%-- 										<span class="selectpicker form-control" ><spring:message code="end_date"/></span> --%>
+<!--                                    	</div> -->
+<!--                                     <input name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" -->
+<%-- 										value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
+<!--                           		</div>  -->
+<!--                             </div> -->
+
                           	<div class="pull-left">	
 				 				  <div class="input-group">
 				                     <div class="input-group-btn">
 										<span class="selectpicker form-control" ><spring:message code="task_name"/></span>
 		                          	</div>
-                                   	<input name="taskName" type="text" class="form-control Wdate input-medium" maxlength="20" value="${log.taskName }" />
+		                              	<select id="taskIds" name="taskIds" title="<spring:message code="select"/>" class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 2" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>" data-actions-box="true">
-                          		</div> 
+											<c:forEach items="${taskList}" var="taskInfo" >
-                            </div>
+												<option value="${taskInfo.id}"><spring:message code="${taskInfo.taskName}"></spring:message></option>
-							<div class="pull-left">
+											</c:forEach>
-								<div class="input-group">
+										</select>
-                                	<div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
-                                   	</div>
-                                   	<input name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-                          		</div> 
-                            </div>
-							<div class="pull-left">
-								<div class="input-group">
-                                    <div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
-                                   	</div>
-                                    <input name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 								  </div>
                     		 </div>
+                    		 
 							<div class="pull-left">
 								 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 								 <button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+								 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 							</div>
 							<div class="pull-right">
 				                    <div class="btn-group">
@@ -124,29 +134,60 @@
                                 </a>
                             </div>
 							
-						</div>
-						<div class="col-md-12">
-							<div class="pull-left">
-								<div class="input-group">
-                                	<div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="task_begin_time"/></span>
-                                   	</div>
-                                   	<input name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchTaskStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-                          		</div> 
-                            </div>
-							<div class="pull-left">
-								<div class="input-group">
-                                    <div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="task_end_time"/></span>
-                                   	</div>
-                                    <input name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-                          		</div> 
-                            </div>
 						</div>
 						<!-- 搜索内容与操作按钮栏 -->
 						
+						<!-- 筛选搜索内容栏默认隐藏-->
+						<div class="col-md-12 filter-action-select-panle hide" >
+							<div class="row">
+							
+								<div class="col-md-3">
+									
+									<div class="form-group">
+                                         <label><spring:message code="task_time"/>：</label>
+                                         <input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/>
+                                       </div>
+		
+								</div>
+								
+								<div class="col-md-3">
+									
+									<div class="form-group">
+                                         <label>&nbsp;</label>
+                                         <input id="searchTaskEndTime" name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchTaskStartTime\')}',maxDate:'#F{$dp.$D(\'searchTaskStartTime\',{d:7})}'});"/>
+                                    </div>
+		
+								</div>
+								
+								
+								<div class="col-md-3">
+									
+									<div class="form-group">
+                                           <label><spring:message code="stat_time"/>：</label>
+										<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
+                                    </div>
+		
+								</div>
+								
+								<div class="col-md-3">
+									
+									<div class="form-group">
+                                           <label>&nbsp;</label>
+                                         	<input id="searchReportEndTime" name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchReportStartTime\')}',maxDate:'#F{$dp.$D(\'searchReportStartTime\',{d:7})}'});"/>
+                                    </div>
+		
+							 	</div>
+								
+							</div>
+							
+						</div>
+							
+							<!-- /筛选搜索内容栏    结束-->
+						
 					</form:form>
 				</div>
 				<sys:message content="${message}"/>
@@ -162,7 +203,7 @@
 								<th class="sort-column ip_addr" column="ip_addr"><spring:message code="ip_addr"/></th>
 								<th class="sort-column sum" column="sum"><spring:message code="sum"/></th>
 								<th class="sort-column url_count" column="url_count"><spring:message code="url_count"/></th> --%>
-								<th class="sort-column task_id" column="taskId"><spring:message code="task_id"/></th>
+								<th class="sort-column task_id" column="taskIds"><spring:message code="task_id"/></th>
 								<th class="sort-column task_name" column="taskName"><spring:message code="task_name"/></th>
 								<th class="sort-column ip_count" column="ipNum"><spring:message code="ip_count"/></th>
 								<th class="sort-column http_num" column="httpNum"><spring:message code="http_num"/></th>
@@ -177,7 +218,7 @@
 						<tbody>
 							<c:forEach var="log" items="${page.list }" varStatus="status">								
 									<tr>
-									 	<td>${log.taskId }</td>
+									 	<td>${log.taskIds }</td>
 										<td>${log.taskName }</td>
 										<td>${log.ipNum }</td>
 										<td>${log.httpNum }</td>

src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp

@@ -36,18 +36,18 @@
 			}
 		});
 // 		//筛选功能
-// 		filterActionInit();
+		filterActionInit();
 		
 		
-// 	$("span[id^=close]").on("click",function(){
+	$("span[id^=close]").on("click",function(){
-// 			var closeId=$(this).attr("id");
+			var closeId=$(this).attr("id");
-// 			var openId=$(this).attr("id").replace("close","open");
+			var openId=$(this).attr("id").replace("close","open");
-// 			$("#"+closeId).hide();
+			$("#"+closeId).hide();
-// 			$("#"+openId).show();
+			$("#"+openId).show();
-//        	$("#"+closeId).parent().parent().next("tr").hide();
+       	$("#"+closeId).parent().parent().next("tr").hide();
-// 		});
+		});
-// 		ajaxConnPercent();
+		ajaxConnPercent();
-// 	});
+	});
 	
 </script>
 </head>
@@ -68,45 +68,55 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						
+						<!-- 筛选按钮展开状态-->
+						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+					
 						<div class="col-md-12">
-                            <div class="pull-left">
+<!--                             <div class="pull-left"> -->
-								<div class="input-group">
+<!-- 								<div class="input-group"> -->
-                                    <div class="input-group-btn">
+<!--                                     <div class="input-group-btn"> -->
-										<span class="selectpicker form-control" ><spring:message code="task_id"/></span>
+<%-- 										<span class="selectpicker form-control" ><spring:message code="task_name"/></span> --%>
-                                   	</div>
+<!--                                    	</div> -->
-                                   	<input name="taskId" type="text" class="form-control Wdate input-medium" maxlength="20" value="${log.taskId}" />
+<%--                                    	<input name="taskName" type="text" class="form-control input-small" maxlength="20" value="${log.taskName }" /> --%>
-                          		</div> 
+<!--                           		</div>  -->
-                            </div>
+<!--                             </div> -->
+							
+<!-- 							<div class="pull-left"> -->
+<!-- 								<div class="input-group"> -->
+<!--                                 	<div class="input-group-btn"> -->
+<%-- 										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span> --%>
+<!--                                    	</div> -->
+<!--                                    	<input name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" -->
+<%-- 										value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
+<!--                           		</div>  -->
+<!--                             </div> -->
+<!-- 							<div class="pull-left"> -->
+<!-- 								<div class="input-group"> -->
+<!--                                     <div class="input-group-btn"> -->
+<%-- 										<span class="selectpicker form-control" ><spring:message code="end_date"/></span> --%>
+<!--                                    	</div> -->
+<!--                                     <input name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" -->
+<%-- 										value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
+<!--                           		</div>  -->
+<!--                             </div> -->
+
                           	<div class="pull-left">	
 				 				  <div class="input-group">
 				                     <div class="input-group-btn">
 										<span class="selectpicker form-control" ><spring:message code="task_name"/></span>
 		                          	</div>
-                                   	<input name="taskName" type="text" class="form-control Wdate input-medium" maxlength="20" value="${log.taskName }" />
+		                              	<select id="taskIds" name="taskIds" title="<spring:message code="select"/>" class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 2" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>" data-actions-box="true">
+											<c:forEach items="${taskList}" var="taskInfo" >
+												<option value="${taskInfo.id}"><spring:message code="${taskInfo.taskName}"></spring:message></option>
+											</c:forEach>
+										</select>
 								  </div>
                     		 </div>
                     		 
-							<div class="pull-left">
-								<div class="input-group">
-                                	<div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
-                                   	</div>
-                                   	<input name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-                          		</div> 
-                            </div>
-							<div class="pull-left">
-								<div class="input-group">
-                                    <div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
-                                   	</div>
-                                    <input name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-                          		</div> 
-                            </div>
 							<div class="pull-left">
 								 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 								 <button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+								 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 							</div>
 							<div class="pull-right">
 				                    <div class="btn-group">
@@ -125,28 +135,59 @@
                                 </a>
                             </div>
 							
-						</div>
-						<div class="col-md-12">
-							<div class="pull-left">
-								<div class="input-group">
-                                	<div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="task_begin_time"/></span>
-                                   	</div>
-                                   	<input name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchTaskStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-                          		</div> 
-                            </div>
-							<div class="pull-left">
-								<div class="input-group">
-                                    <div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="task_end_time"/></span>
-                                   	</div>
-                                    <input name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-                          		</div> 
-                            </div>
 						</div>
 						<!-- 搜索内容与操作按钮栏 -->
+
+						<!-- 筛选搜索内容栏默认隐藏-->
+						<div class="col-md-12 filter-action-select-panle hide" >
+							<div class="row">
+							
+								<div class="col-md-3">
+									
+									<div class="form-group">
+                                         <label><spring:message code="task_time"/>：</label>
+                                         <input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/>
+                                       </div>
+		
+								</div>
+								
+								<div class="col-md-3">
+									
+									<div class="form-group">
+                                         <label>&nbsp;</label>
+                                         <input id="searchTaskEndTime" name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchTaskStartTime\')}',maxDate:'#F{$dp.$D(\'searchTaskStartTime\',{d:30})}'});"/>
+                                    </div>
+		
+								</div>
+								
+								
+								<div class="col-md-3">
+									
+									<div class="form-group">
+                                           <label><spring:message code="stat_time"/>：</label>
+										<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
+                                    </div>
+		
+								</div>
+								
+								<div class="col-md-3">
+									
+									<div class="form-group">
+                                           <label>&nbsp;</label>
+                                         	<input id="searchReportEndTime" name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchReportStartTime\')}',maxDate:'#F{$dp.$D(\'searchReportStartTime\',{d:30})}'});"/>
+                                    </div>
+		
+							 	</div>
+								
+							</div>
+							
+						</div>
+							
+							<!-- /筛选搜索内容栏    结束-->
 					</form:form>
 				</div>
 				<sys:message content="${message}"/>
@@ -162,7 +203,7 @@
 								<th class="sort-column ip_addr" column="ip_addr"><spring:message code="ip_addr"/></th>
 								<th class="sort-column sum" column="sum"><spring:message code="sum"/></th>
 								<th class="sort-column url_count" column="url_count"><spring:message code="url_count"/></th> --%>
-								<th class="sort-column task_id" column="taskId"><spring:message code="task_id"/></th>
+								<th class="sort-column task_id" column="taskIds"><spring:message code="task_id"/></th>
 								<th class="sort-column task_name" column="taskName"><spring:message code="task_name"/></th>
 								<th class="sort-column letter_num" column="letterNum"><spring:message code="letter_num"/></th>
 								<th class="sort-column config_num" column="configNum"><spring:message code="config_num"/></th>
@@ -176,7 +217,7 @@
 						<tbody>
 							<c:forEach var="log" items="${page.list }" varStatus="status">								
 									<tr>
-									 	<td>${log.taskId }</td>
+									 	<td>${log.taskIds }</td>
 										<td>${log.taskName }</td>
 										<td>${log.letterNum }</td>
 										<td>${log.configNum }</td>

src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp

@@ -36,17 +36,17 @@
 			}
 		});
 		//筛选功能
-//		filterActionInit();
+		filterActionInit();
 		
 		
-//	$("span[id^=close]").on("click",function(){
+	$("span[id^=close]").on("click",function(){
-//			var closeId=$(this).attr("id");
+			var closeId=$(this).attr("id");
-//			var openId=$(this).attr("id").replace("close","open");
+			var openId=$(this).attr("id").replace("close","open");
-//			$("#"+closeId).hide();
+			$("#"+closeId).hide();
-//			$("#"+openId).show();
+			$("#"+openId).show();
-//        	$("#"+closeId).parent().parent().next("tr").hide();
+       	$("#"+closeId).parent().parent().next("tr").hide();
-//		});
+		});
-//		ajaxConnPercent();
+		ajaxConnPercent();
 	});
 	
 </script>
@@ -68,44 +68,63 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						
+						<!-- 筛选按钮展开状态-->
+						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+					
+						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
-                            <div class="pull-left">
+<!--                             <div class="pull-left"> -->
-								<div class="input-group">
+<!-- 								<div class="input-group"> -->
-                                    <div class="input-group-btn">
+<!--                                     <div class="input-group-btn"> -->
-										<span class="selectpicker form-control" ><spring:message code="task_id"/></span>
+<%-- 										<span class="selectpicker form-control" ><spring:message code="task_id"/></span> --%>
-                                   	</div>
+<!--                                    	</div> -->
-                                   	<input name="taskId" type="text" class="form-control Wdate input-medium" maxlength="20" value="${log.taskId}" />
+<%--                                    	<input name="taskIds" type="text" class="form-control Wdate input-medium" maxlength="20" value="${log.taskIds}" /> --%>
-                          		</div> 
+<!--                           		</div>  -->
-                            </div>
+<!--                             </div> -->
+<!--                             <div class="pull-left"> -->
+<!-- 								<div class="input-group"> -->
+<!--                                     <div class="input-group-btn"> -->
+<%-- 										<span class="selectpicker form-control" ><spring:message code="task_name"/></span> --%>
+<!--                                    	</div> -->
+<%--                                    	<input name="taskName" type="text" class="form-control input-small" maxlength="30" value="${log.taskName }" /> --%>
+<!--                           		</div>  -->
+<!--                             </div> -->
+                            
                           	<div class="pull-left">	
 				 				  <div class="input-group">
 				                     <div class="input-group-btn">
 										<span class="selectpicker form-control" ><spring:message code="task_name"/></span>
 		                          	</div>
-                                   	<input name="taskName" type="text" class="form-control Wdate input-medium" maxlength="20" value="${log.taskName }" />
+		                              	<select id="taskIds" name="taskIds" title="<spring:message code="select"/>" class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 2" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>" data-actions-box="true">
-                          		</div> 
+											<c:forEach items="${taskList}" var="taskInfo" >
-                            </div>
+												<option value="${taskInfo.id}"><spring:message code="${taskInfo.taskName}"></spring:message></option>
-							<div class="pull-left">
+											</c:forEach>
-								<div class="input-group">
+										</select>
-                                	<div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
-                                   	</div>
-                                   	<input name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-                          		</div> 
-                            </div>
-							<div class="pull-left">
-								<div class="input-group">
-                                    <div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
-                                   	</div>
-                                    <input name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 								  </div>
                     		 </div>
+                    		
+<!-- 							<div class="pull-left"> -->
+<!-- 								<div class="input-group"> -->
+<!--                                 	<div class="input-group-btn"> -->
+<%-- 										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span> --%>
+<!--                                    	</div> -->
+<!--                                    	<input name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" -->
+<%-- 										value="${log.searchReportStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
+<!--                           		</div>  -->
+<!--                             </div> -->
+<!-- 							<div class="pull-left"> -->
+<!-- 								<div class="input-group"> -->
+<!--                                     <div class="input-group-btn"> -->
+<%-- 										<span class="selectpicker form-control" ><spring:message code="end_date"/></span> --%>
+<!--                                    	</div> -->
+<!--                                     <input name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" -->
+<%-- 										value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> --%>
+<!--                           		</div>  -->
+<!--                             </div> -->
 							<div class="pull-left">
 								 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 								 <button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+								 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 							</div>
 							<div class="pull-right">
 				                    <div class="btn-group">
@@ -124,29 +143,60 @@
                                 </a>
                             </div>
 							
-						</div>
-						<div class="col-md-12">
-							<div class="pull-left">
-								<div class="input-group">
-                                	<div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="task_begin_time"/></span>
-                                   	</div>
-                                   	<input name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchTaskStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-                          		</div> 
-                            </div>
-							<div class="pull-left">
-								<div class="input-group">
-                                    <div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="task_end_time"/></span>
-                                   	</div>
-                                    <input name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-                          		</div> 
-                            </div>
 						</div>
 						<!-- 搜索内容与操作按钮栏 -->
 						
+						<!-- 筛选搜索内容栏默认隐藏-->
+						<div class="col-md-12 filter-action-select-panle hide" >
+							<div class="row">
+							
+								<div class="col-md-3">
+									
+									<div class="form-group">
+                                         <label><spring:message code="task_time"/>：</label>
+                                         <input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/>
+                                       </div>
+		
+								</div>
+								
+								<div class="col-md-3">
+									
+									<div class="form-group">
+                                         <label>&nbsp;</label>
+                                         <input id="searchTaskEndTime" name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchTaskStartTime\')}',maxDate:'#F{$dp.$D(\'searchTaskStartTime\',{d:7})}'});"/>
+                                    </div>
+		
+								</div>
+								
+								
+								<div class="col-md-3">
+									
+									<div class="form-group">
+                                           <label><spring:message code="stat_time"/>：</label>
+										<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
+                                    </div>
+		
+								</div>
+								
+								<div class="col-md-3">
+									
+									<div class="form-group">
+                                           <label>&nbsp;</label>
+                                         	<input id="searchReportEndTime" name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchReportStartTime\')}',maxDate:'#F{$dp.$D(\'searchReportStartTime\',{d:7})}'});"/>
+                                    </div>
+		
+							 	</div>
+								
+							</div>
+							
+						</div>
+							
+							<!-- /筛选搜索内容栏    结束-->
+						
 					</form:form>
 				</div>
 				<sys:message content="${message}"/>
@@ -162,7 +212,7 @@
 								<th class="sort-column ip_addr" column="ip_addr"><spring:message code="ip_addr"/></th>
 								<th class="sort-column sum" column="sum"><spring:message code="sum"/></th>
 								<th class="sort-column url_count" column="url_count"><spring:message code="url_count"/></th> --%>
-								<th class="sort-column task_id" column="taskId"><spring:message code="task_id"/></th>
+								<th class="sort-column task_id" column="taskIds"><spring:message code="task_id"/></th>
 								<th class="sort-column task_name" column="taskName"><spring:message code="task_name"/></th>
 								<th class="sort-column ip_count" column="ipNum"><spring:message code="ip_count"/></th>
 								<th class="sort-column http_num" column="httpNum"><spring:message code="http_num"/></th>
@@ -177,7 +227,7 @@
 						<tbody>
 							<c:forEach var="log" items="${page.list }" varStatus="status">								
 									<tr>
-									 	<td>${log.taskId }</td>
+									 	<td>${log.taskIds }</td>
 										<td>${log.taskName }</td>
 										<td>${log.ipNum }</td>
 										<td>${log.httpNum }</td>