cti去除部分无用代码

NetLib/CTI/NetworkCti.cpp

@@ -20,9 +20,26 @@ void CNetworkCti::__procRegDevListMsg(CPduEntity & a_PduEntity)
 	auto devList = a_PduEntity.GetDataString(0);
 	CString dev;
 	dev.Format("|%d|", PDU_DEV_TYPE_IVR);
-	m_IsIvrConnected = devList.Find(dev) < 0 ? false : true;
+	bool newIvrConnected = devList.Find(dev) < 0 ? false : true;
 	dev.Format("|%d|", PDU_DEV_TYPE_ACD);
-	m_IsAcdConnected = devList.Find(dev) < 0 ? false : true;
+	auto newAcdConnected = devList.Find(dev) < 0 ? false : true;
+
+	if (!m_IsAcdConnected && newAcdConnected) { // acd 连接
+		// 通知线路类Acd连接成功
+		CLineHolder::GetInstance().onAcdConnected();
+	}
+	else if (m_IsAcdConnected && !newAcdConnected) { // acd连接断开
+
+	}
+	m_IsAcdConnected = newAcdConnected;
+	if (m_IsIvrConnected && !newIvrConnected) { // ivr掉线
+		// 通知IvrFlow IVR连接断开
+		CIvrFlowHolder::GetInstance().onIvrDisconnect();
+	}
+	else if (!m_IsIvrConnected && newIvrConnected) { // ivr上线
+
+	}
+	m_IsIvrConnected = newIvrConnected;
 }
 
 
@@ -142,34 +159,6 @@ void CNetworkCti::__onDisconnect(const PduLinkContent& linkContent)
 
 void CNetworkCti::__onHeartMonitorDrop(int devType)
 {
-	//switch (devType)
-	//{
-	//case 2:
-	//case 3:
-	//	ILogger::getInstance().log(LOG_CLASS_SOCKET, LOG_LEVEL_WARNING, _T("CTI监听设备[%s]心跳超时"), devType == 2 ? "IVR" : "ACD");
-	//	break;
-	//default:
-	//	break;
-	//}
-	//return;
-	//if (devType == 2) // ivr
-	//{
-	//	if (m_DevIvr.DevId = -1) return;
-	//	CInterfaceWindow::getIocpLinkInstance()->ClosePduClient((PDU_DEV_TYPE)devType, m_DevIvr.DevId);
-	//	memset(&m_DevIvr, 0, sizeof(m_DevIvr));
-	//	m_DevIvr.DevId = -1;
-	//	// 通知IvrFlow IVR连接断开
-	//	CIvrFlowHolder::GetInstance().onIvrDisconnect();
-	//	m_IsIvrConnected = FALSE;
-	//}
-	//else if (devType == 3) // acd
-	//{
-	//	if (m_DevAcd.DevId = -1) return;
-	//	CInterfaceWindow::getIocpLinkInstance()->ClosePduClient((PDU_DEV_TYPE)devType, m_DevIvr.DevId);
-	//	memset(&m_DevAcd, 0, sizeof(m_DevAcd));
-	//	m_DevAcd.DevId = -1;
-	//	m_IsAcdConnected = FALSE;
-	//}
 }
 
 /*****************************************************************
@@ -183,16 +172,12 @@ void CNetworkCti::OnLinkStateChanged(const PduLinkContent& linkContent)
 	// 连接信息日志显示
 	LOG_LEVEL nLogLevel = LOG_LEVEL_WARNING;
 	CString Msg;
-
 	switch (linkContent.nLinkState)
 	{
-	case PDU_LINK_STATE_ACCEPTED:
-	{
-		Msg = _T("{Net}: Far End Accepted, ");
-		nLogLevel = LOG_LEVEL_NORMAL;
-	}
-	break;
-
+	case PDU_LINK_STATE_SUCCESSED:
+		break;
+	case PDU_LINK_STATE_FAILED:
+		break;
 	case PDU_LINK_STATE_DISCONNECTED:
 	{
 		Msg = _T("{Net}: Far End Disconnected, ");
@@ -218,39 +203,12 @@ void CNetworkCti::OnLinkStateChanged(const PduLinkContent& linkContent)
 
 	default:
 	{
-		ASSERT(FALSE);
 		Msg = _T("{Net}: Unknown Netlink State, ");
 		nLogLevel = LOG_LEVEL_WARNING;
 	}
 	break;
 	}
 
-	// 判断设备类型
-	switch (linkContent.nFarType)
-	{
-	case PDU_DEV_TYPE_ACD:
-	{
-		CString Temp;
-		Temp.Format(_T(" Far End[Type = ACD, Id = %d, Addr = %s:%d]"), linkContent.nFarId, linkContent.szFarIp, linkContent.nFarPort);
-		Msg += Temp;
-	}
-	break;
-
-	case PDU_DEV_TYPE_IVR:
-	{
-		CString Temp;
-		Temp.Format(_T(" Far End[Type = IVR, Id = %d, Addr = %s:%d]"), linkContent.nFarId, linkContent.szFarIp, linkContent.nFarPort);
-		Msg += Temp;
-	}
-	break;
-
-	default:
-		CString Temp;
-		Temp.Format(_T(" Far End[Type = UnKnown, Id = %d, Addr = %s:%d]"), linkContent.nFarId, linkContent.szFarIp, linkContent.nFarPort);
-		Msg += Temp;
-		break;
-	}
-
 	// 通知日志
 	ILogger::getInstance().log(LOG_CLASS_SOCKET, nLogLevel, _T("%s"), Msg);
 }
@@ -371,7 +329,6 @@ BOOL CNetworkCti::init()
 ****************************************************************/
 void CNetworkCti::release(void)
 {
-	//CInterfaceWindow::getIocpLinkInstance()->StopAll();
 	CNetInterface::getNetInstance()->ClosePduClient(PDU_DEV_TYPE_CTI, 1);
 }
 
@@ -383,7 +340,6 @@ void CNetworkCti::release(void)
 ****************************************************************/
 BOOL CNetworkCti::send2ACD(CPduEntity& a_PduEntity)
 {
-	//return CInterfaceWindow::getIocpCommInstance()->Send(&a_PduEntity, PDU_DEV_TYPE_ACD, m_DevAcd.DevId);
 	return CNetInterface::getNetInstance()->Send(&a_PduEntity, PDU_DEV_TYPE_ACD, m_DevAcd.DevId);
 }
 
@@ -395,6 +351,5 @@ BOOL CNetworkCti::send2ACD(CPduEntity& a_PduEntity)
 ****************************************************************/
 BOOL CNetworkCti::send2IVR(CPduEntity& a_PduEntity)
 {
-	//return CInterfaceWindow::getIocpCommInstance()->Send(&a_PduEntity, PDU_DEV_TYPE_IVR, m_DevIvr.DevId);
-	return CNetInterface::getNetInstance()->Send(&a_PduEntity, PDU_DEV_TYPE_IVR, m_DevIvr.DevId);
+   return CNetInterface::getNetInstance()->Send(&a_PduEntity, PDU_DEV_TYPE_IVR, m_DevIvr.DevId);
 }

NetLib/CTI/Task.cpp

@@ -65,8 +65,6 @@ BOOL CTask::OnCmdOperation(CPduEntity &PduEntity)
 {
 	PduEntity.SetToExecReturn();
 	PduEntity.SetDataBool(0, false);
-	// 2022-10-31
-	//CInterfaceWindow::getIocpCommInstance()->Send(&PduEntity, PduEntity.GetLocalDevType(), PduEntity.GetLocalDevId());
 	CNetInterface::getNetInstance()->Send(&PduEntity, PduEntity.GetLocalDevType(), PduEntity.GetLocalDevId());
 	return FALSE;
 }
@@ -211,8 +209,6 @@ void CTask::_ProcCmdReturn(BOOL Result, bool FreeRes/* = false*/ )
 	}
 	m_CurrCmd.SetToExecReturn();
 	m_CurrCmd.SetDataBool(0, Result ? true : false);
-	// 2022-10-31
-	//bool t_rnt = CInterfaceWindow::getIocpCommInstance()->Send(&m_CurrCmd, m_CurrCmd.GetLocalDevType(), m_CurrCmd.GetLocalDevId());
 	bool t_rnt = CNetInterface::getNetInstance()->Send(&m_CurrCmd, m_CurrCmd.GetLocalDevType(), m_CurrCmd.GetLocalDevId());
 	ILogger::getInstance().log(LOG_CLASS_SOCKET, LOG_LEVEL_NORMAL, _T("CTI->,CMD Line = %d, IsSuccess = %d "), m_pCurrLine == NULL ? 0 : m_pCurrLine->lineId(), t_rnt);
 }

NetLib/CTI/TaskAgentConsulCall.cpp

@@ -167,8 +167,6 @@ BOOL CTaskAgentConsulCall::OnCmdOperation(CPduEntity &PduEntity)
 	{
 		PduEntity.SetToExecReturn();
 		PduEntity.SetDataBool(0, false);
-		// 2022-10-31
-		//CInterfaceWindow::getIocpCommInstance()->Send(&PduEntity, PduEntity.GetLocalDevType(), PduEntity.GetLocalDevId());
 		CNetInterface::getNetInstance()->Send(&PduEntity, PduEntity.GetLocalDevType(), PduEntity.GetLocalDevId());
 		return FALSE;
 	}

NetLib/CTI/TaskMgr.cpp

@@ -122,8 +122,6 @@ void CTaskMgr::__onTaskFailed( CTask* pTask, CPduEntity &PduEntity )
 	// ÃüÁî·µ»Ø
 	PduEntity.SetToExecReturn();
 	PduEntity.SetDataBool(0, false);
-	// 2022-10-31
-	//CInterfaceWindow::getIocpCommInstance()->Send(&PduEntity, PduEntity.GetLocalDevType(), PduEntity.GetLocalDevId());
 	CNetInterface::getNetInstance()->Send(&PduEntity, PduEntity.GetLocalDevType(), PduEntity.GetLocalDevId());
 	// ÒƳýTask
 	removeTask(reinterpret_cast<LONG>(pTask));
@@ -475,8 +473,6 @@ void CTaskMgr::onTaskPduMsg( UINT LineId, CPduEntity &PduEntity )
 			// ·µ»ØÃüÁî
 			PduEntity.SetToExecReturn();
 			PduEntity.SetDataBool(0, false);
-			// 2022-10-31
-			//CInterfaceWindow::getIocpCommInstance()->Send(&PduEntity, PduEntity.GetLocalDevType(), PduEntity.GetLocalDevId());
 			CNetInterface::getNetInstance()->Send(&PduEntity, PduEntity.GetLocalDevType(), PduEntity.GetLocalDevId());
 		}
 	}