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

(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;
+	}
+
 }

src/main/java/com/nis/util/CodeDicUtils.java

@@ -194,6 +194,15 @@ public class CodeDicUtils {
 		}
 		return result;
 	}
+	/**
+	 * 用于显示日志isp运营商的信息
+	 * @param name
+	 * @return
+	 */
+	public static List<SysIspInfo> getIspListByIspNum(){
+		List<SysIspInfo> result = codeSysIspInfoDicDao.getIspListByIspNum();;
+		return result;
+	}
 	public static void main(String[] args) {
 		getCodeList(APP_CODE);
 	}

src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java

@@ -23,6 +23,7 @@ import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.SysUser;
 import com.nis.domain.configuration.WebsiteDomainTopic;
+import com.nis.domain.dashboard.SysIspInfo;
 import com.nis.domain.log.NtcConnRecordLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.exceptions.MaatConvertException;
@@ -119,6 +120,19 @@ public class NtcConnRecordLogController extends BaseController {
 						}.getType());
 				if (fromJson.getStatus().intValue() == 200) {
 					Page<NtcConnRecordLog> data = fromJson.getData();
+					List<SysIspInfo> ispList = CodeDicUtils.getIspListByIspNum();
+					if(data.getList()!=null&&data.getList().size()>0){
+						for (NtcConnRecordLog cnn : data.getList()) {
+							String isNum=cnn.getEntranceId()+""+cnn.getDeviceId();
+							for (SysIspInfo sysIspInfo : ispList) {
+									if(isNum.equals(sysIspInfo.getIspNum())){
+										cnn.setIspName(sysIspInfo.getIspKeyName());
+										break;
+									}
+							}
+							
+						}
+					}
 					page.setCount(data.getCount());
 					page.setLast(data.getLast());
 					page.setList(data.getList());

src/main/java/com/nis/web/dao/dashboard/codedic/CodeSysIspInfoDicDao.java

@@ -8,4 +8,5 @@ import com.nis.web.dao.MyBatisDao;
 @MyBatisDao
 public interface CodeSysIspInfoDicDao {
 	List<SysIspInfo> getIspDicList();
+	List<SysIspInfo> getIspListByIspNum();
 }

src/main/java/com/nis/web/dao/dashboard/codedic/CodeSysIspInfoDicDao.xml

@@ -19,4 +19,9 @@
     <include refid="Base_Column_List" />
     from sys_isp_info
   </select>
+  <select id="getIspListByIspNum" resultType="com.nis.domain.dashboard.SysIspInfo">
+		select distinct s.isp_key_code ispKeyCode ,concat(d.entrance_id,d.device_id) ispNum,s.isp_key_name ispKeyName from sys_device_info d
+		left join sys_isp_info s on d.isp=s.isp_key_code
+	</select>
+  
 </mapper>