ANS\HTTPS report界面调整提交

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

@@ -11,8 +11,21 @@ public class NtcAsnRecord extends BaseLogEntity<NtcAsnRecord>{
 	protected String bps;
 	@ExcelField(title="pps",sort=9)
 	protected String pps;
-
-	
+	@ExcelField(title="asn",sort=10)
+	protected String asn;
+	public String getAsn() {
+		return asn;
+	}
+	public void setAsn(String asn) {
+		this.asn = asn;
+	}
+	public String getSearchAsnType() {
+		return searchAsnType;
+	}
+	public void setSearchAsnType(String searchAsnType) {
+		this.searchAsnType = searchAsnType;
+	}
+	protected String searchAsnType;//1:d_asn;2:s_asn
 	
 	public String getBps() {
 		return bps;

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

@@ -1,17 +1,25 @@
 package com.nis.domain.report;
 
+import java.util.Date;
 import java.util.List;
 
 import com.nis.domain.log.BaseLogEntity;
+import com.nis.util.excel.ExcelField;
 
-public class NtcURLReport extends BaseLogEntity<NtcURLReport>{
+public class NtcURLReport  extends BaseLogEntity<NtcAsnRecord>{
 	
 	private static final long serialVersionUID = -4947912502754359817L;
 	
-
+	@ExcelField(title="url",sort=1)
 	protected String url;
-	protected Integer urlCount;
-	protected List<NtcURLReportBase> dataList;
+	/*protected long urlCount;*/
+	@ExcelField(title="ipCount",sort=2)
+	protected long ipCount;
+	@ExcelField(title="connCount",sort=3)
+	protected long connCount;
+	@ExcelField(title="reportTime",sort=4)
+	private String reportTime;
+	//protected List<NtcURLReportBase> dataList;
 	
 	protected String searchReportStartTime;//开始时间
 	protected String searchReportEndTime;//结束时间
@@ -42,18 +50,38 @@ public class NtcURLReport extends BaseLogEntity<NtcURLReport>{
 	public void setUrl(String url) {
 		this.url = url;
 	}
-	public Integer getUrlCount() {
+	/*public long getUrlCount() {
 		return urlCount;
 	}
-	public void setUrlCount(Integer urlCount) {
+	public void setUrlCount(long urlCount) {
 		this.urlCount = urlCount;
+	}*/
+	public long getIpCount() {
+		return ipCount;
 	}
-	public List<NtcURLReportBase> getDataList() {
+	public void setIpCount(long ipCount) {
+		this.ipCount = ipCount;
+	}
+	public long getConnCount() {
+		return connCount;
+	}
+	public void setConnCount(long connCount) {
+		this.connCount = connCount;
+	}
+	public String getReportTime() {
+		return reportTime;
+	}
+	public void setReportTime(String reportTime) {
+		this.reportTime = reportTime;
+	}
+	
+	
+	/*public List<NtcURLReportBase> getDataList() {
 		return dataList;
 	}
 	public void setDataList(List<NtcURLReportBase> dataList) {
 		this.dataList = dataList;
-	}
+	}*/
 		
 	
 }