acd添加12345项目的大屏展示数据，FirstStep修改宏为自动判断数据库类型，FsLink修改三方通话外呼到手机号，网页外呼指定ip话机音频编码

ACD/ACD.vcxproj

@@ -131,6 +131,8 @@
     <ClInclude Include="AgentGroup.h" />
     <ClInclude Include="AgentOffice.h" />
     <ClInclude Include="Config.h" />
+    <ClInclude Include="SItemAgenStateDuration.h" />
+    <ClInclude Include="SItemAgenStateTimeDetail.h" />
     <ClInclude Include="StrategyLoopByAgentId.h" />
     <ClInclude Include="Exten.h" />
     <ClInclude Include="ExtenCtrl.h" />
@@ -181,6 +183,8 @@
     <ClCompile Include="AgentGroup.cpp" />
     <ClCompile Include="AgentOffice.cpp" />
     <ClCompile Include="Config.cpp" />
+    <ClCompile Include="SItemAgenStateDuration.cpp" />
+    <ClCompile Include="SItemAgenStateTimeDetail.cpp" />
     <ClCompile Include="StrategyLoopByAgentId.cpp" />
     <ClCompile Include="Exten.cpp" />
     <ClCompile Include="ExtenCtrl.cpp" />

ACD/ACD.vcxproj.filters

@@ -224,6 +224,12 @@
     <ClInclude Include="StrategyLoopByAgentId.h">
       <Filter>BLL\Strategy</Filter>
     </ClInclude>
+    <ClInclude Include="SItemAgenStateDuration.h">
+      <Filter>BLL\Statistics</Filter>
+    </ClInclude>
+    <ClInclude Include="SItemAgenStateTimeDetail.h">
+      <Filter>BLL\Statistics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -356,6 +362,12 @@
     <ClCompile Include="StrategyLoopByAgentId.cpp">
       <Filter>BLL\Strategy</Filter>
     </ClCompile>
+    <ClCompile Include="SItemAgenStateDuration.cpp">
+      <Filter>BLL\Statistics</Filter>
+    </ClCompile>
+    <ClCompile Include="SItemAgenStateTimeDetail.cpp">
+      <Filter>BLL\Statistics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ACD.rc">

ACD/Agent.cpp

@@ -161,7 +161,7 @@ void CAgent::__reportLogin()
 	lstrcpy(repLogin.szGroup, m_GroupID);
 	lstrcpy(repLogin.szAgentIP, m_AgentIp);
 
-	CSLogic::GetInstance().onSEvent(m_AgentID, REP_EVENT_LOGIN, &repLogin);
+	CSLogic::GetInstance().onSEvent(m_AgentID, m_Exten, REP_EVENT_LOGIN, &repLogin);
 }
 
 /*****************************************************************
@@ -187,7 +187,7 @@ void CAgent::__reportLogout(const UINT HostAgent)
 	repLogout.nAnswerCount = m_AnswerCount;
 	repLogout.nReposeCount = m_ReposeCount;
 
-	CSLogic::GetInstance().onSEvent(m_AgentID, REP_EVENT_LOGOUT, &repLogout);
+	CSLogic::GetInstance().onSEvent(m_AgentID, m_Exten, REP_EVENT_LOGOUT, &repLogout);
 }
 
 /*****************************************************************
@@ -203,7 +203,7 @@ void CAgent::__onStatusUpdate(AGENT_STATE State, bool StartFlag)
 	EvtStatus.State = State;
 	EvtStatus.StartFlag = StartFlag;
 
-	CSLogic::GetInstance().onSEvent(m_AgentID, REP_EVENT_STATE, &EvtStatus);
+	CSLogic::GetInstance().onSEvent(m_AgentID, m_Exten, REP_EVENT_STATE, &EvtStatus);
 }
 
 /*****************************************************************

ACD/SItemAgenStateDuration.cpp

@@ -0,0 +1,201 @@
+#include "StdAfx.h"
+#include "SItemAgenStateDuration.h"
+#include <atltime.h>
+
+CSItemAgenState::CSItemAgenState(UINT AgentId,UINT Exten, ULONG LoginId)  :m_AgentID(AgentId),m_Exten(Exten),m_LoginID(LoginId),m_CurrState(AGENT_STATE_UNKNOWN)
+{
+	
+}
+
+
+CSItemAgenState::~CSItemAgenState(void)
+{
+}
+
+
+void CSItemAgenState::onSEvent(REP_EVENT EvtType, PARAM Param)
+{
+	switch(EvtType)
+	{
+	case REP_EVENT_LOGIN:
+		__OnAgentLogin();
+		break;
+	case REP_EVENT_LOGOUT:
+		__OnAgentLogout();
+		break;
+	case REP_EVENT_STATE:
+		__OnAgentState(Param);
+		break;
+	}
+}
+
+
+void CSItemAgenState::__OnAgentLogin()
+{
+	m_CurrState = AGENT_STATE_FREE;
+	CString m_strLoginDate;
+
+	CTime m_time;  
+	m_time=CTime::GetCurrentTime();             //获取当前时间日期  
+	m_strLoginDate=m_time.Format(_T("%Y-%m-%d %H:%M:%S"));  
+
+
+
+
+	// 编写SQL语句
+	m_Sql.Format(_T("INSERT INTO rep_agentState_Duration (AgentId, Exten,LoginId, LoginTime,LogoutTime)VALUES\
+					(%d,%d, %d, '%s',NULL)"),
+					m_AgentID,
+					m_Exten,
+					m_LoginID,
+					m_strLoginDate
+					);
+
+	__execSQL();
+}
+
+void CSItemAgenState::__OnAgentLogout()
+{
+
+	__ProcStateEnd(m_CurrState);
+
+	CString m_strLogoutDate;
+
+	CTime m_time;    
+	m_time=CTime::GetCurrentTime();             //获取当前时间日期  
+	m_strLogoutDate=m_time.Format(_T("%Y-%m-%d %H:%M:%S"));  
+
+
+
+	m_Sql.Format(_T("UPDATE rep_agentState_Duration SET LogoutTime = '%s' WHERE AgentId = %d AND LoginId = %d"),
+		m_strLogoutDate,
+		m_AgentID,
+		m_LoginID
+		);
+
+	__execSQL();
+
+}
+
+
+void CSItemAgenState::__OnAgentState( PARAM Param)
+{
+	T_EvtStatus* pStatus = (T_EvtStatus*)Param;
+	ASSERT(pStatus != NULL);
+	if(pStatus == NULL)
+		return;
+	if(!pStatus->StartFlag) return;
+
+	
+
+	__ProcStateEnd(m_CurrState);
+	switch(pStatus->State)
+	{
+	case AGENT_STATE_FREE:
+		{
+			__ProcStateStart(AGENT_STATE_FREE);
+		}
+		break; 
+	case AGENT_STATE_BUSY:
+		{
+			__ProcStateStart(AGENT_STATE_BUSY);
+		}
+		break;
+	case AGENT_STATE_POST_PROCESSING:
+		{
+		   __ProcStateStart(AGENT_STATE_POST_PROCESSING);
+		}
+		break;
+	case AGENT_STATE_REPOSE:
+		{
+			__ProcStateStart(AGENT_STATE_REPOSE);
+			__ProcReposeCount();
+		}
+		break;
+	default:
+		break;
+
+	}
+
+	m_CurrState = pStatus->State;
+}
+
+void CSItemAgenState::__ProcStateStart(AGENT_STATE state)
+{ 
+	m_StartTime=CTime::GetCurrentTime();             //获取当前时间日期  
+}
+
+void CSItemAgenState::__ProcStateEnd(AGENT_STATE state)
+{
+	if(m_StartTime==0) return;
+	m_EndTime=CTime::GetCurrentTime();             //获取当前时间日期  
+
+	CTimeSpan  m_DuringTime = m_EndTime - m_StartTime;
+
+	LONGLONG durtime=  m_DuringTime.GetTotalSeconds();
+
+	__WriteToSQL(durtime,state);
+}
+
+void CSItemAgenState::__WriteToSQL(int second,AGENT_STATE state)
+{
+	switch(state)
+	{
+	case AGENT_STATE_FREE:
+		{
+			m_Sql.Format(_T("UPDATE rep_agentState_Duration SET Free = Free+%d WHERE AgentId = %d AND LoginId = %d"),
+				second,
+				m_AgentID,
+				m_LoginID
+				);
+
+		}
+		break; 
+	case AGENT_STATE_BUSY:
+		{
+			m_Sql.Format(_T("UPDATE rep_agentState_Duration SET Talking = Talking+%d WHERE AgentId = %d AND LoginId = %d"),
+				second,
+				m_AgentID,
+				m_LoginID
+				);
+		}
+		break;
+	case AGENT_STATE_POST_PROCESSING:
+		{
+			m_Sql.Format(_T("UPDATE rep_agentState_Duration SET PostProcess = PostProcess+%d WHERE AgentId = %d AND LoginId = %d"),
+				second,
+				m_AgentID,
+				m_LoginID
+				);
+		
+		}
+		break;
+	case AGENT_STATE_REPOSE:
+		{
+			m_Sql.Format(_T("UPDATE rep_agentState_Duration SET Repose =Repose+%d WHERE AgentId = %d AND LoginId = %d"),
+				second,
+				m_AgentID,
+				m_LoginID
+				);
+			
+		}
+		break;
+	default:
+		break;
+
+	}
+
+
+
+	__execSQL();
+}
+
+void CSItemAgenState::__ProcReposeCount()
+{
+	m_Sql.Format(_T("UPDATE rep_agentState_Duration SET ReposeConut =ReposeConut+%d WHERE AgentId = %d AND LoginId = %d"),
+		1,
+		m_AgentID,
+		m_LoginID
+		);
+	__execSQL();
+}

ACD/SItemAgenStateDuration.h

@@ -0,0 +1,45 @@
+#pragma once
+#include "sitem.h"
+#include "atltime.h" 
+#include "TemplateTimer.h"
+class CSItemAgenState : public CSItem
+{
+public:
+	CSItemAgenState(UINT AgentId,UINT Exten, ULONG LoginId);
+	~CSItemAgenState(void);
+
+
+
+     void onSEvent(REP_EVENT EvtType, PARAM Param);	 // ͳ¼Æʼþ±ä»¯Í¨Öª
+
+
+private:
+
+	void __OnAgentLogin();
+	void __OnAgentLogout();
+	void __OnAgentState( PARAM Param);
+
+	void __ProcStateStart(AGENT_STATE state);
+	void __ProcStateEnd(AGENT_STATE state);
+
+	void __WriteToSQL(int second,AGENT_STATE state);
+
+	void __ProcReposeCount();
+
+
+private:
+	UINT m_AgentID;
+	ULONG m_LoginID;
+	UINT  m_Exten;
+
+
+
+	CTime m_StartTime;
+	CTime m_EndTime;
+
+	AGENT_STATE m_CurrState;
+	
+
+
+};
+

ACD/SItemAgenStateTimeDetail.cpp

@@ -0,0 +1,130 @@
+#include "StdAfx.h"
+#include "SItemAgenStateTimeDetail.h"
+#include <atltime.h>
+
+CSItemAgenStateTimeDetail::CSItemAgenStateTimeDetail(UINT AgentId):m_AgentID(AgentId),m_CurrState(AGENT_STATE_UNKNOWN)
+{
+	
+}
+
+
+CSItemAgenStateTimeDetail::~CSItemAgenStateTimeDetail(void)
+{
+}
+
+
+void CSItemAgenStateTimeDetail::onSEvent(REP_EVENT EvtType, PARAM Param)
+{
+	switch(EvtType)
+	{
+	case REP_EVENT_LOGIN:
+		break;
+	case REP_EVENT_LOGOUT:
+		__OnAgentLogout();
+		break;
+	case REP_EVENT_STATE:
+		__OnAgentState(Param);
+		break;
+	}
+}
+
+
+void CSItemAgenStateTimeDetail::__OnAgentLogin()
+{
+	
+}
+
+void CSItemAgenStateTimeDetail::__OnAgentLogout()
+{
+
+	__ProcStateEnd(m_CurrState);
+
+}
+
+
+void CSItemAgenStateTimeDetail::__OnAgentState( PARAM Param)
+{
+	T_EvtStatus* pStatus = (T_EvtStatus*)Param;
+	ASSERT(pStatus != NULL);
+	if(pStatus == NULL)
+		return;
+	if(!pStatus->StartFlag) return;
+
+	
+
+	__ProcStateEnd(m_CurrState);
+	switch(pStatus->State)
+	{
+	case AGENT_STATE_FREE:
+		{
+			__ProcStateStart(AGENT_STATE_FREE);
+		}
+		break; 
+	case AGENT_STATE_BUSY:
+		{
+			__ProcStateStart(AGENT_STATE_BUSY);
+		}
+		break;
+	case AGENT_STATE_POST_PROCESSING:
+		{
+		   __ProcStateStart(AGENT_STATE_POST_PROCESSING);
+		}
+		break;
+	case AGENT_STATE_REPOSE:
+		{
+			__ProcStateStart(AGENT_STATE_REPOSE);
+	
+		}
+		break;
+	default:
+		break;
+
+	}
+
+	m_CurrState = pStatus->State;
+}
+
+void CSItemAgenStateTimeDetail::__ProcStateStart(AGENT_STATE state)
+{ 
+
+	CTime m_time;  
+	m_time=CTime::GetCurrentTime();             //获取当前时间日期  
+	m_StartTime=m_time.Format(_T("%Y-%m-%d %H:%M:%S"));  
+
+
+	CString strDate;
+	strDate = m_time.Format("%Y%m%d");
+	m_LoginDate = atoi(strDate);
+
+
+	// 编写SQL语句
+	m_Sql.Format(_T("INSERT INTO rep_agentState_Detail (AgentId,LoginDate,Type,TimeStart)VALUES\
+					(%d, %d, %d, '%s')"),
+					m_AgentID,
+					m_LoginDate,
+					state,
+					m_StartTime
+					);
+
+	__execSQL();
+}
+
+void CSItemAgenStateTimeDetail::__ProcStateEnd(AGENT_STATE state)
+{
+
+	CTime m_time;  
+	m_time=CTime::GetCurrentTime();             //获取当前时间日期  
+	m_EndTime=m_time.Format(_T("%Y-%m-%d %H:%M:%S"));  
+
+	// 编写SQL语句
+
+	m_Sql.Format(_T("UPDATE rep_agentState_Detail SET TimeEnd = '%s' WHERE AgentId = %d AND LoginDate = %d AND TimeStart='%s'"),
+		m_EndTime,
+		m_AgentID,
+		m_LoginDate,
+		m_StartTime
+		);
+
+	__execSQL();
+}
+

ACD/SItemAgenStateTimeDetail.h

@@ -0,0 +1,40 @@
+#pragma once
+#include "sitem.h"
+#include "atltime.h" 
+#include "TemplateTimer.h"
+class CSItemAgenStateTimeDetail : public CSItem
+{
+public:
+	CSItemAgenStateTimeDetail(UINT AgentId);
+	~CSItemAgenStateTimeDetail(void);
+
+
+
+     void onSEvent(REP_EVENT EvtType, PARAM Param);	 // ͳ¼Æʼþ±ä»¯Í¨Öª
+
+
+private:
+
+	void __OnAgentLogin();
+	void __OnAgentLogout();
+	void __OnAgentState( PARAM Param);
+
+	void __ProcStateStart(AGENT_STATE state);
+	void __ProcStateEnd(AGENT_STATE state);
+
+
+
+private:
+	UINT m_AgentID;
+
+
+	int     m_LoginDate;
+	CString m_StartTime;
+	CString m_EndTime;
+
+	AGENT_STATE m_CurrState;
+	
+
+
+};
+

ACD/SLogic.cpp

@@ -2,6 +2,8 @@
 #include "SLogic.h"
 #include "SItemAgentDetail.h"
 #include "SItemAgentStatus.h"
+#include "SItemAgenStateDuration.h"
+#include "SItemAgenStateTimeDetail.h"
 
 SINGLETON_IMPLEMENT(CSLogic)
 
@@ -22,12 +24,34 @@ CSLogic::~CSLogic(void)
 ****************************************************************/
 ULONG CSLogic::__getAgentLoginId( UINT AgentId )
 {
+	//CString SQL;
+	//SQL.Format("SELECT LoginId FROM rep_agent_detail where AgentId = %d ORDER BY LoginId DESC", AgentId);
+	//ULONG LoginID = IOtlConnection::getInstance()->GetSingleDataInt(SQL);
+	//return ++LoginID;
+
+	// 20201211 合并12345功能
 	CString SQL;
+	ULONG LoginID = 0;
+
+	CTime m_time;
+	m_time = CTime::GetCurrentTime();             //获取当前时间日期  
+	CString str = m_time.Format(_T("%Y%m%d"));
+	int Timeid = atoi(str.GetBuffer(0));
+
+	SQL.Format("SELECT LoginId FROM rep_agentState_Duration where AgentId = %d ORDER BY LoginId DESC", AgentId);
+	LoginID = IOtlConnection::getInstance()->GetSingleDataInt(SQL);
 
-	SQL.Format("SELECT LoginId FROM rep_agent_detail where AgentId = %d ORDER BY LoginId DESC", AgentId);
-	ULONG LoginID = IOtlConnection::getInstance()->GetSingleDataInt(SQL);
+	ULONG  LoninIDTime = LoginID / 100;
+
+	if (LoginID == 0 || LoginID > 2917092801 || LoninIDTime < Timeid)
+	{
+		long lognid = Timeid * 100 + 1;
+
+		return lognid;
+	}
 
 	return ++LoginID;
+
 }
 
 /*****************************************************************
@@ -48,6 +72,25 @@ void CSLogic::__onAgentLogin( UINT AgentId )
 	m_ItemMap.insert(pair<UINT, CSItem*>(AgentId, pItemStatus));
 }
 
+void CSLogic::__onAgentLogin(UINT AgentId, UINT Exten)
+{
+	// 获取当前坐席的签入ID
+	ULONG LoginID = __getAgentLoginId(AgentId);
+
+	CSItem* pItemDetail = new CSItemAgentDetail(AgentId, LoginID);
+	m_ItemMap.insert(pair<UINT, CSItem*>(AgentId, pItemDetail));
+
+	CSItem* pItemStatus = new CSItemAgentStatus(AgentId, LoginID);
+	m_ItemMap.insert(pair<UINT, CSItem*>(AgentId, pItemStatus));
+
+	CSItem* pItemState = new CSItemAgenState(AgentId, Exten, LoginID);
+	m_ItemMap.insert(pair<UINT, CSItem*>(AgentId, pItemState));
+
+
+	CSItem* pItemStateTimeDetail = new CSItemAgenStateTimeDetail(AgentId);
+	m_ItemMap.insert(pair<UINT, CSItem*>(AgentId, pItemStateTimeDetail));
+}
+
 /*****************************************************************
 **【函数名称】	__onAgentLogout
 **【函数功能】	坐席签出处理
@@ -84,27 +127,52 @@ void CSLogic::__onAgentLogout( UINT AgentId )
 				Param: 参数
 **【返回值】	
 ****************************************************************/
-void CSLogic::onSEvent( UINT AgentId, REP_EVENT EvtType, PARAM Param )
+//void CSLogic::onSEvent( UINT AgentId, REP_EVENT EvtType, PARAM Param )
+//{
+//	// 坐席签入处理
+//	if(EvtType == REP_EVENT_LOGIN) 
+//		__onAgentLogin(AgentId);
+//
+//	SItemMap::iterator itr;
+//	SItemMap::iterator itrEnd;
+//
+//	itr = m_ItemMap.find(AgentId);
+//	if(itr == m_ItemMap.end())
+//		return;
+//
+//	itrEnd = m_ItemMap.upper_bound(AgentId);
+//	// 事件消息群发
+//	for(; itr != itrEnd; ++itr)
+//	{
+//		itr->second->onSEvent(EvtType, Param);
+//	}
+//
+//	// 坐席签出处理
+//	if(EvtType == REP_EVENT_LOGOUT) 
+//		__onAgentLogout(AgentId);
+//}
+
+void CSLogic::onSEvent(UINT AgentId, UINT Exten, REP_EVENT EvtType, PARAM Param)
 {
 	// 坐席签入处理
-	if(EvtType == REP_EVENT_LOGIN) 
-		__onAgentLogin(AgentId);
+	if (EvtType == REP_EVENT_LOGIN)
+		__onAgentLogin(AgentId, Exten);
 
 	SItemMap::iterator itr;
 	SItemMap::iterator itrEnd;
 
 	itr = m_ItemMap.find(AgentId);
-	if(itr == m_ItemMap.end())
+	if (itr == m_ItemMap.end())
 		return;
 
 	itrEnd = m_ItemMap.upper_bound(AgentId);
 	// 事件消息群发
-	for(; itr != itrEnd; ++itr)
+	for (; itr != itrEnd; ++itr)
 	{
 		itr->second->onSEvent(EvtType, Param);
 	}
 
 	// 坐席签出处理
-	if(EvtType == REP_EVENT_LOGOUT) 
+	if (EvtType == REP_EVENT_LOGOUT)
 		__onAgentLogout(AgentId);
 }

ACD/SLogic.h

@@ -30,13 +30,16 @@ class CSLogic
 public:	
 	~CSLogic(void);
 
-	void onSEvent(UINT AgentId, REP_EVENT EvtType, PARAM Param);	 // 统计事件变化通知
-
+	//void onSEvent(UINT AgentId, REP_EVENT EvtType, PARAM Param);	 // 统计事件变化通知
+	// 20201211合并12345项目
+	void onSEvent(UINT AgentId, UINT Exten, REP_EVENT EvtType, PARAM Param);	 // 统计事件变化通知
 private:
 	CSLogic(void);
 
 	ULONG __getAgentLoginId(UINT AgentId);
 	void __onAgentLogin(UINT AgentId);
+	// 20201211合并12345项目
+	void __onAgentLogin(UINT AgentId, UINT Exten);
 	void __onAgentLogout(UINT AgentId);
 
 private:

FirstStep/ConfigLoader.cpp

@@ -92,11 +92,11 @@ bool CConfigLoader::__loadExtenCfg( void )
 bool CConfigLoader::__loadSipAccountCfg( void )
 {
 	long Count = 0;
-#ifdef DSN_ORACLE
+	if (DB_MySQL == IOtlConnection::getInstance()->GetDatabaseType() || DB_Oracle == IOtlConnection::getInstance()->GetDatabaseType())
 	Count = IOtlConnection::getInstance()->GetSingleDataInt(_T("SELECT COUNT(*)  FROM USER_TAB_COLUMNS WHERE TABLE_NAME = 'CONF_SIP_ACCOUNT' AND COLUMN_NAME ='ISDYNAMICGW'"));
-#else 
+	else if (DB_SQLServer == IOtlConnection::getInstance()->GetDatabaseType())
 	Count = IOtlConnection::getInstance()->GetSingleDataInt(_T("select count(*) from information_schema.columns where table_name = 'conf_sip_account' and column_name = 'IsDynamicGw'"));
-#endif
+ 
 	IOtlRecordset* pAccountRcd = NULL;
 	BOOL bAddOk = FALSE;
 	if (Count == 1)

FirstStep/stdafx.h

@@ -26,7 +26,6 @@
 
 #include <afxdisp.h>        // MFC ×Ô¶¯»¯Àà
 
-#define DSN_ORACLE         // Á¬½ÓoracleÊý¾Ý¿â
 
 
 #ifndef _AFX_NO_OLE_SUPPORT

FsLink/EslGateway.cpp

@@ -314,9 +314,29 @@ void CEslGateway::__onEslEvtChanEvent( esl_event_t* pEvent )
 	ASSERT(HeaderValue != NULL);
 	lstrcpy(Notify.ChanId, HeaderValue);
 
-	// 获取主被叫
-	HeaderValue = esl_event_get_header(pEvent, ESL_HEADER_CALLER);
-	lstrcpy(Notify.Caller, HeaderValue);
+	try
+	{
+		LOGGER(LOG_LEVEL_NORMAL, _T("{CEslGateway}: 获取主叫 start"));
+		// 自定义主叫，如果自定义主叫不为空，使用自定义主叫（分机呼叫修改）
+		HeaderValue = esl_event_get_header(pEvent, ESL_HEADER_CHAN_OP_CALLER);
+		if (HeaderValue != NULL)
+		{
+			lstrcpy(Notify.Caller, HeaderValue);
+		}
+		else
+		{
+			// 获取主被叫
+			HeaderValue = esl_event_get_header(pEvent, ESL_HEADER_CALLER);
+			lstrcpy(Notify.Caller, HeaderValue);
+		}
+		LOGGER(LOG_LEVEL_NORMAL, _T("{CEslGateway}: 获取主叫 end"));
+	}
+	catch (const std::exception& e)
+	{
+		LOGGER(LOG_LEVEL_NORMAL, _T("{CEslGateway}: 获取主叫异常[%s]"),e.what());
+	}
+	
+
 	HeaderValue = esl_event_get_header(pEvent, ESL_HEADER_CALLEE);
 	if (HeaderValue != NULL)
 	{

FsLink/FsLinkInc.h

@@ -77,6 +77,7 @@
 // FS变量相关
 #define ESL_VAR_OP_INSTANCE					_T("op_instance")
 #define ESL_VAR_DTMF_KEY					_T("dtmf_key")
+#define ESL_VAR_OP_CALLER                   _T("op_caller")       
 
 // ESL事件头域
 #define ESL_HEADER_CHAN_UNIQUE_ID			_T("Caller-Unique-ID")
@@ -96,6 +97,7 @@
 #define ESL_HEADER_CALL_FAILED_CAUSE		_T("variable_originate_disposition")
 #define ESL_HEADER_CHAN_OP_INSTANCE			_T("variable_op_instance")
 #define ESL_HEADER_DTMF						_T("DTMF-Digit")
+#define ESL_HEADER_CHAN_OP_CALLER           _T("variable_op_caller")    // 自定义主叫
 
 // ESL事件头域常量值
 #define ESL_HDR_DIRECTION_INBOUND			_T("inbound")

FsLink/FsProxy.cpp

@@ -681,9 +681,26 @@ void CFsProxy::unregBusyChan(CVirtualChan* pChan)
 bool CFsProxy::ExtenCall(LONG JobId, CVirtualChan* pChan, LPCTSTR CallerNum, LPCTSTR CalleeNum)
 {
 	CString EslCmd;
-	EslCmd.Format(_T("bgapi originate {origination_caller_id_number=%lu,absolute_codec_string='PCMA,PCMU'}user/%lu %s XML %s\r\n%s: %ld"),
-		pChan->no(), pChan->no(), CalleeNum, CConfig::extContext(), ESL_HEADER_JOB_UUID, JobId);
+	//EslCmd.Format(_T("bgapi originate {origination_caller_id_number=%lu,absolute_codec_string='PCMA,PCMU'}user/%lu %s XML %s\r\n%s: %ld"),
+	//	pChan->no(), pChan->no(), CalleeNum, CConfig::extContext(), ESL_HEADER_JOB_UUID, JobId);
 
+	try
+	{
+		LOGGER(LOG_LEVEL_NORMAL, _T("{CFsProxy}: ExtenCall start"));
+		CString CallString;
+		CString  Caller, Called;
+		Called = CalleeNum;
+		if (!m_CallStringMaker.makeCallStringWithDefault(Caller, Called, CallString))
+			return false;
+		EslCmd.Format(_T("bgapi originate {origination_caller_id_number=%s,%s=%lu,absolute_codec_string='PCMA,PCMU'}user/%lu %s XML %s\r\n%s: %ld"),
+			Called, ESL_VAR_OP_CALLER, pChan->no(), pChan->no(), CalleeNum, CConfig::extContext(), ESL_HEADER_JOB_UUID, JobId);
+		LOGGER(LOG_LEVEL_NORMAL, _T("{CFsProxy}: ExtenCall end"));
+	}
+	catch (const std::exception& e)
+	{
+		LOGGER(LOG_LEVEL_NORMAL, _T("{CFsProxy}: ExtenCall 异常[%s]"), e.what());
+	}
+	
 	return m_Gateway.sendCmd(EslCmd);
 }
 
@@ -820,8 +837,8 @@ std::string CFsProxy::EslCommand(std::string strFsIp, int FsPort, std::string st
 ****************************************************************/
 bool CFsProxy::meeting(LONG JobId, CString CallerNum, CString DestNum, LPCTSTR MeetingId)
 {
+	/*
 	bool bMatchPrefix = m_CallStringMaker.isMatchPrefix(DestNum);
-
 	TRUNK_MATCH* pMatch = NULL;
 	CString CallString;
 	if (!m_CallStringMaker.makeCallString(CallerNum, DestNum, CallString, pMatch))
@@ -847,6 +864,12 @@ bool CFsProxy::meeting(LONG JobId, CString CallerNum, CString DestNum, LPCTSTR M
 			}
 		}
 	}
+	*/
+
+	CString CallString;
+	if (!m_CallStringMaker.makeCallString(CallerNum, DestNum, CallString))
+		return false;
+	
 	LOGGER(LOG_LEVEL_NORMAL, _T("{FsProxy}: 三方会议呼叫字符串: %s"), CallString);
 
 	CString EslCmd;

FsLink/VirtualChan.cpp

@@ -47,7 +47,7 @@ void CVirtualChan::_setSession( LPCTSTR SessionId, LPCTSTR ChanId )
 ****************************************************************/
 void CVirtualChan::_reset( void )
 {
-	LOGGER(LOG_LEVEL_NORMAL, _T("{CVirtualChan}: 执行线路[%lu]重置",m_No));
+	LOGGER(LOG_LEVEL_NORMAL, _T("{CVirtualChan}: 执行线路[%lu]重置"), m_No);
 	m_State = CHAN_LOGIC_STATE_FREE;
 	m_IsInMeeting = false;
 	m_CalleeNum = _T("");