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

(cherry picked from commit 698fd13a65)

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>