事件报表 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() {
-		return taskId;
+	public String getTaskIds() {
+		return taskIds;
 	}
 
-	public void setTaskId(String taskId) {
-		this.taskId = taskId;
+	public void setTaskIds(String taskIds) {
+		this.taskIds = taskIds;
 	}
 
 	public String getReportTime() {
@@ -143,9 +144,9 @@ public class NtcEventKeyProtectionReport {
 
 	@Override
 	public String toString() {
-		return "NtcEventKeyProtectionReport [taskTime=" + taskTime + ", taskName=" + taskName + ", letterNum="
-				+ letterNum + ", configNum=" + configNum + ", monitorNum=" + monitorNum + ", controlNum=" + controlNum
-				+ ", taskId=" + taskId + ", reportTime=" + reportTime + ", searchReportStartTime="
+		return "NtcEventKeyProtectionReport [taskIds=" + taskIds + ", taskName=" + taskName + ", letterNum=" + letterNum
+				+ ", configNum=" + configNum + ", monitorNum=" + monitorNum + ", controlNum=" + controlNum
+				+ ", 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() {
-		return taskId;
+	public String getTaskIds() {
+		return taskIds;
 	}
 
-	public void setTaskId(String taskId) {
-		this.taskId = taskId;
+	public void setTaskIds(String taskIds) {
+		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
-				+ ", searchTaskStartTime=" + searchTaskStartTime + ", searchTaskEndTime=" + searchTaskEndTime
-				+ ", reportType=" + reportType + ", taskId=" + taskId + ", reportTime=" + reportTime + "]";
+				+ ", taskIds=" + taskIds + ", reportTime=" + reportTime + ", searchReportStartTime="
+				+ searchReportStartTime + ", searchReportEndTime=" + searchReportEndTime + ", searchTaskStartTime="
+				+ searchTaskStartTime + ", searchTaskEndTime=" + searchTaskEndTime + ", reportType=" + reportType + "]";
 	}
 
 }