添加会议录视频的路径到通道变量

MidWare_WinStandard1.0-zmd/ACD/VideoOffice.cpp

@@ -13,7 +13,7 @@ CVideoOffice::~CVideoOffice()
 bool CVideoOffice::initVideoExten()
 {
 	CString sql;
-	sql.Format("SELECT [exten] ,[pwd] FROM [ZMD12345].[dbo].[conf_video_account]");
+	sql.Format("SELECT [exten] ,[pwd] FROM [dbo].[conf_video_account]");
 	IOtlConnection* pConn = IOtlConnection::getInstance();
 	IOtlRecordset* record = pConn->QueryRecords(sql);
 	ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{CVideoOffice}: ÊÓƵÕ˺ſªÊ¼³õʼ»¯"));

MidWare_WinStandard1.0-zmd/FsLink/CfgSipAccount.cpp

@@ -37,11 +37,18 @@ void CCfgSipAccount::__free( void )
 bool CCfgSipAccount::load( void )
 {
 	long Count = 0;
-#ifdef DSN_ORACLE
-	Count = COtlConnection::GetOtlInstence()->GetSingleDataInt(_T("SELECT COUNT(*)  FROM USER_TAB_COLUMNS WHERE TABLE_NAME = 'CONF_SIP_ACCOUNT' AND COLUMN_NAME ='ISDYNAMICGW'"));
-#else 
-	Count = COtlConnection::GetOtlInstence()->GetSingleDataInt(_T("select count(*) from information_schema.columns where table_name = 'conf_sip_account' and column_name = 'IsDynamicGw'"));
-#endif
+	if (DB_MySQL == COtlConnection::GetOtlInstence()->GetDatabaseType() || DB_Oracle == COtlConnection::GetOtlInstence()->GetDatabaseType())
+	{
+		Count = COtlConnection::GetOtlInstence()->GetSingleDataInt(_T("SELECT COUNT(*)  FROM USER_TAB_COLUMNS WHERE TABLE_NAME = 'CONF_SIP_ACCOUNT' AND COLUMN_NAME ='ISDYNAMICGW'"));
+	}
+	else if (DB_SQLServer == COtlConnection::GetOtlInstence()->GetDatabaseType())
+	{
+		Count = COtlConnection::GetOtlInstence()->GetSingleDataInt(_T("select count(*) from information_schema.columns where table_name = 'conf_sip_account' and column_name = 'IsDynamicGw'"));
+	}
+	else
+	{
+		return false;
+	}
 
 	COtlRecordset* pAccountRcd = NULL;
 	BOOL bAddOk = FALSE;

MidWare_WinStandard1.0-zmd/FsLink/FsProxy.cpp

@@ -920,6 +920,13 @@ bool CFsProxy::takeBack(LONG JobId, CVirtualChan* pChan)
 ****************************************************************/
 bool CFsProxy::record(LONG JobId, CVirtualChan* pChan, LPCTSTR RcdFile)
 {
+	CString filePath = RcdFile;
+	int index = filePath.ReverseFind('.');
+	filePath = filePath.Left(index) + "-confe.mp4";
+	CString Param;
+	Param.Format(_T("filePath=%s"), filePath);
+	m_Gateway.Execte2("export", Param, pChan->chanId());
+
 	CString EslCmd;
 	EslCmd.Format(_T("bgapi uuid_record %s start %s\r\n%s: %ld"), pChan->chanId(), RcdFile, ESL_HEADER_JOB_UUID, JobId);