通联关系日志展示运营商，修复排序功能

(cherry picked from commit 698fd13a65)

src/main/java/com/nis/domain/dashboard/SysIspInfo.java

@@ -18,6 +18,7 @@ public class SysIspInfo implements Serializable {
 	private Integer ispKeyCode;// 运营商唯一标识编码,
 	private Date createTime;
 	
+	private String ispNum; // 出入口跟设备号拼接
 	
 	public Long getId() {
 		return id;
@@ -67,6 +68,11 @@ public class SysIspInfo implements Serializable {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
-	
+	public String getIspNum() {
+		return ispNum;
+	}
+	public void setIspNum(String ispNum) {
+		this.ispNum = ispNum;
+	}
 	
 }

src/main/java/com/nis/domain/log/NtcConnRecordLog.java

@@ -1,5 +1,6 @@
 package com.nis.domain.log;
 
+import com.google.gson.annotations.Expose;
 import com.nis.util.excel.ExcelField;
 
 public class NtcConnRecordLog extends BaseLogEntity<NtcConnRecordLog> {
@@ -29,8 +30,12 @@ public class NtcConnRecordLog extends BaseLogEntity<NtcConnRecordLog> {
 	protected String totalByte;
 	
 	protected String ispCode;//运营商
+	protected String ispNum;//运营商 （entrance_id+device_id）
+	@Expose
+	@ExcelField(title="client_port",sort=43)
+	protected String ispName;//运营商
+	
 	
-
 	
 	public String getIspCode() {
 		return ispCode;
@@ -120,4 +125,20 @@ public class NtcConnRecordLog extends BaseLogEntity<NtcConnRecordLog> {
 		this.s2cByteNum = s2cByteNum;
 	}
 
+	public String getIspName() {
+		return ispName;
+	}
+
+	public void setIspName(String ispName) {
+		this.ispName = ispName;
+	}
+
+	public String getIspNum() {
+		return ispNum;
+	}
+
+	public void setIspNum(String ispNum) {
+		this.ispNum = ispNum;
+	}
+
 }