diff --git a/src/main/java/com/nis/domain/dashboard/SysIspInfo.java b/src/main/java/com/nis/domain/dashboard/SysIspInfo.java index 62c740bef..c00100eb6 100644 --- a/src/main/java/com/nis/domain/dashboard/SysIspInfo.java +++ b/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; + } } diff --git a/src/main/java/com/nis/domain/log/NtcConnRecordLog.java b/src/main/java/com/nis/domain/log/NtcConnRecordLog.java index f056a776e..9483d9ac6 100644 --- a/src/main/java/com/nis/domain/log/NtcConnRecordLog.java +++ b/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 { @@ -29,8 +30,12 @@ public class NtcConnRecordLog extends BaseLogEntity { 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 { 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; + } + } diff --git a/src/main/java/com/nis/util/CodeDicUtils.java b/src/main/java/com/nis/util/CodeDicUtils.java index 9101cdbcf..f161f5b3e 100644 --- a/src/main/java/com/nis/util/CodeDicUtils.java +++ b/src/main/java/com/nis/util/CodeDicUtils.java @@ -194,6 +194,15 @@ public class CodeDicUtils { } return result; } + /** + * 用于显示日志isp运营商的信息 + * @param name + * @return + */ + public static List getIspListByIspNum(){ + List result = codeSysIspInfoDicDao.getIspListByIspNum();; + return result; + } public static void main(String[] args) { getCodeList(APP_CODE); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java index acf3f175b..335db9682 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java +++ b/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 data = fromJson.getData(); + List 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()); diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeSysIspInfoDicDao.java b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeSysIspInfoDicDao.java index 6f0f17cef..16d7a2992 100644 --- a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeSysIspInfoDicDao.java +++ b/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 getIspDicList(); + List getIspListByIspNum(); } diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeSysIspInfoDicDao.xml b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeSysIspInfoDicDao.xml index 42cc528aa..e96b9a6fa 100644 --- a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeSysIspInfoDicDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeSysIspInfoDicDao.xml @@ -19,4 +19,9 @@ from sys_isp_info + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp index bce69e6a9..bf1b86247 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp @@ -140,8 +140,7 @@ - +
<%--
@@ -391,6 +390,7 @@ + @@ -505,6 +505,7 @@ ${log.sIp} ${log.dPort } ${log.sPort } + ${log.ispName } ${log.s2cPktNum } ${log.c2sPktNum }