系统视频外呼

MidWare_WinStandard1.0-zmd/ACD/AcdCore.cpp

@@ -802,11 +802,20 @@ void CAcdCore::__onCmdAgentReqExten(CPduEntity * a_pCmd)
 
 void CAcdCore::__onCmdAgentReqAgent(CPduEntity * a_pCmd)
 {
-	uint32_t agentId;
-	uint32_t extenId;
-	bool ret = m_AgentOffice.getFreeAgent(agentId,extenId);
+	uint32_t agentId=0;
+	uint32_t extenId=0;
+	bool ret = false;
+	auto group = a_pCmd->GetDataString(4); // 请求的该组空闲坐席
+	if (group == "" || group.IsEmpty()) {
+		ret = m_AgentOffice.getFreeAgent(agentId, extenId);
+	}
+	else {
+		ret = m_AgentOffice.getFreeAgentByGroup(agentId, extenId,group);
+	}
+	
 	a_pCmd->SetDataBool(0, ret);
-	a_pCmd->SetDataUInt(2, extenId);
+	a_pCmd->SetDataUInt(2, extenId); // 请求到的空闲分机号
+	a_pCmd->SetDataUInt(3, agentId); // 请求到的空闲坐席号
 	std::cout << agentId << "-" << extenId << std::endl;
 	CNetworkAcd::GetInstance().send2Server(a_pCmd);
 }

MidWare_WinStandard1.0-zmd/ACD/AcdCore.h

@@ -16,6 +16,7 @@
 #include "VideoOffice.h"
 #include "DepttelextOffice.h"
 
+
 class CAgent;
 class CExten;
 /*************************************************************************
@@ -94,6 +95,7 @@ private:
 
 	CVideoOffice m_VideoOffice;                     // ÊÓƵÕ˺ŹÜÀíÀà
 	CDepttelextOffice m_DepttelextOffice;
+	
 	SoftAuther m_Auther;                 //ÊÚȨ
 };
 

MidWare_WinStandard1.0-zmd/ACD/AgentOffice.cpp

@@ -132,7 +132,7 @@ void CAgentOffice::clearAgent( void )
 	}
 
 	m_AgentMap.RemoveAll();
-	 
+	m_GroupMap.clear(); // 2023-06-19
 }
 
 /*****************************************************************
@@ -157,6 +157,14 @@ BOOL CAgentOffice::insertAgent( UINT a_AgentID, UINT a_ExtID, LPCTSTR a_GroupID,
 	CAgent* pAgent = new CAgent(a_AgentID, a_ExtID, a_GroupID, a_AgentType, a_TimePostProcessing);
 	m_AgentMap.SetAt(pAgent->id(), pAgent);		// 座席添加到全体座席索引
 	
+	auto ret = m_GroupMap.equal_range(a_GroupID);
+	for (auto it = ret.first; it != ret.second; ++it) {
+		if (it->second->id() == a_AgentID) {
+			m_GroupMap.erase(it);
+		}
+	}
+	m_GroupMap.insert(std::make_pair(a_GroupID, pAgent));  // 2023-06-19 保存坐席组-坐席
+
 	CAcdCore::GetInstance().getQueueMgr().addAgent(pAgent);
 
 	pAgent->onAssoExtStatusUpdated(a_ExtStatus);// 设置座席当前状态
@@ -200,10 +208,18 @@ BOOL CAgentOffice::removeAgent( UINT a_AgentID, UINT a_HostAgent )
 
 	CSingleLock Lock(&m_Cs4AgentMap, TRUE);
 
+
 	if(m_AgentMap.Lookup(a_AgentID, pAgent))
 	{
 		CAcdCore::GetInstance().getQueueMgr().delAgent(pAgent);		
 
+		// 2023-06-19 视频电话相关
+		auto ret = m_GroupMap.equal_range(pAgent->group());
+		for (auto it = ret.first; it != ret.second; ++it) {
+			m_GroupMap.erase(it);
+			break;
+		}
+
 		m_AgentMap.RemoveKey(a_AgentID);		// 从全体座席索引中删除
 		pAgent->release(a_HostAgent);
 		delete pAgent;                                                
@@ -365,6 +381,22 @@ bool CAgentOffice::getFreeAgent(uint32_t & AgentId, uint32_t & ExtenId)
 	return false;
 }
 
+bool CAgentOffice::getFreeAgentByGroup(uint32_t & AgentId, uint32_t & ExtenId, const LPCTSTR & a_GroupID)
+{
+	auto ret = m_GroupMap.equal_range(a_GroupID);
+	for (auto it = ret.first; it != ret.second; ++it) {
+		auto pAgent = it->second;
+		if (pAgent&&pAgent->isFree() && pAgent->lock()) {
+			m_GroupMap.erase(it);
+			m_GroupMap.insert(std::make_pair(a_GroupID, pAgent));
+			AgentId = pAgent->id();
+			ExtenId = pAgent->assoExten();
+			return true;
+		}
+	}
+	return false;
+}
+
 /*****************************************************************
 **【函数名称】	getStateSpecAgentList
 **【函数功能】	获取指定状态的座席列表

MidWare_WinStandard1.0-zmd/ACD/AgentOffice.h

@@ -11,6 +11,8 @@
 #include "IMsgObserver.h"
 #include<vector>
 #include <map>
+#include <unordered_map>
+
 class CAgent;
 class CStrategyAD;
 class CAgentProperty;
@@ -58,6 +60,8 @@ public:
 
 	// 分配空闲坐席
 	bool getFreeAgent(uint32_t &AgentId, uint32_t &ExtenId);
+	// 根据坐席组获取空闲坐席，视频通话使用 2023-06-19
+	bool getFreeAgentByGroup(uint32_t &AgentId, uint32_t &ExtenId, const LPCTSTR&a_GroupID);
 
 	// 获取指定状态的座席列表
 	void getStateSpecAgentList(AGENT_LIST_SPEC_STATE SpecState, CString& AgentList);
@@ -75,5 +79,7 @@ private:
 	CCriticalSection m_Cs4AgentMap;	
 	CMap<UINT, UINT, CAgent*, CAgent*> m_AgentMap;	// 座席索引表
 	//std::map<UINT, CAgentProperty> m_AgentPropertyMap; // 坐席号，业务属性
+
+	std::unordered_multimap<std::string, CAgent*> m_GroupMap; // 2023-06-19 坐席组-坐席
 };
 

MidWare_WinStandard1.0-zmd/ACD/DepttelextOffice.cpp

@@ -20,15 +20,18 @@ CDepttelextOffice::~CDepttelextOffice()
 bool CDepttelextOffice::InitDepttelext()
 {
 	CString sql;
-	sql.Format("SELECT [Id],[Name],[Telephone],[Extension] ,[CreateTime] FROM  [dbo].[tel_depttelext]");
+	sql = "if not exists (select * from sysobjects where id = object_id('tel_depttelext') " \
+		"and OBJECTPROPERTY(id, 'IsUserTable') = 1) begin " \
+		"create table  tel_depttelext(Id int, Name varchar(50), Telephone varchar(50), Extension varchar(50), primary key (id))" \
+		"end";
+	IOtlConnection::getInstance()->ExecCommand(sql);
+	std::cout << sql.GetBuffer(0) << std::endl;
+	sql.Format("SELECT [Id],[Name],[Telephone],[Extension] FROM  [dbo].[tel_depttelext]");
 	IOtlConnection* pConn = IOtlConnection::getInstance();
 	IOtlRecordset* record = pConn->QueryRecords(sql);
 	ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{CDepttelextOffice}: 分机号码列表开始初始化"));
-	if (record == NULL)
-	{
-		return false;
-	}
-	while (!record->IsEOF())
+	std::cout << sql.GetBuffer(0) << std::endl;
+	while (record && !record->IsEOF())
 	{
 		record->MoveNextRow();
 		 
@@ -37,7 +40,7 @@ bool CDepttelextOffice::InitDepttelext()
 		pDeptTelext->Telephone = record->GetValueStr("Telephone");
 		pDeptTelext->Extension = record->GetValueStr("Extension");
 		pDeptTelext->State = 8;// 默认移除
-
+		pDeptTelext->print();
 		UINT extenId = _ttoi(pDeptTelext->Extension);
 		m_DeptTelextmap.insert(std::make_pair(extenId, pDeptTelext));
 
@@ -47,7 +50,6 @@ bool CDepttelextOffice::InitDepttelext()
 	ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{CDepttelextOffice}: 分机号码列表结束初始化"));
 	IOtlRecordset::DestroyInstance(record);		// 释放记录集
 	return true;
-	return false;
 }
 
 void CDepttelextOffice::UpdateDepttelext(UINT extno, int state)

MidWare_WinStandard1.0-zmd/ACD/DepttelextOffice.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <map>
 #include <string>
+#include <iostream>
 
 class CDepttelextOffice
 {
@@ -20,6 +21,9 @@ private:
 		CString Extension;
 		CString AgentID;
 		int State;
+		void print() {
+			std::cout << Name << "-" << Telephone << "-" << Extension << "-" << AgentID << "-" << State << std::endl;
+		}
 	}DeptTelext;
 
 	std::map<UINT, DeptTelext*> m_DeptTelextmap;  // 2022-09-01

MidWare_WinStandard1.0-zmd/FsLink/FsProxy.cpp

@@ -672,6 +672,15 @@ void CFsProxy::unregBusyChan(CVirtualChan* pChan)
 	m_MapBusyChan.RemoveKey(pChan->chanId());
 }
 
+bool CFsProxy::ExtenVideoCall(LONG JobId, CVirtualChan * pChan, LPCTSTR CallerNum, LPCTSTR CalleeNum)
+{
+	CString EslCmd;
+	EslCmd.Format(_T("bgapi originate {origination_caller_id_number=%lu,absolute_codec_string=^^:VP8:h264:pcma:pcmu}user/%lu %s XML %s\r\n%s: %ld"),
+		pChan->no(), pChan->no(), CalleeNum, CConfig::extContext(), ESL_HEADER_JOB_UUID, JobId);
+
+	return m_Gateway.sendCmd(EslCmd);
+}
+
 /*****************************************************************
 **【函数名称】	ExtenCall
 **【函数功能】	分机呼叫

MidWare_WinStandard1.0-zmd/FsLink/FsProxy.h

@@ -66,6 +66,8 @@ public:
 	void regBusyChan(CVirtualChan* pChan);
 	void unregBusyChan(CVirtualChan* pChan);
 
+	// 发起话机视频呼叫
+	bool ExtenVideoCall(LONG JobId, CVirtualChan* pChan, LPCTSTR CallerNum, LPCTSTR CalleeNum);
 	// 语音操作接口
 	bool ExtenCall(LONG JobId, CVirtualChan* pChan, LPCTSTR CallerNum, LPCTSTR CalleeNum);
 	bool PredictionCall(LONG JobId, CString CallerNum, CString CalleeNum);

MidWare_WinStandard1.0-zmd/FsLink/OpMakeCall.cpp

@@ -69,7 +69,8 @@ bool COpMakeCall::start( LineOpParam* pParam )
 
 	m_pHostChan->opNumber() = pParam->szParam2;
 
-	return CFsProxy::GetInstance().ExtenCall(uniqueId(), m_pHostChan, CallerNum, m_DestNumber);
+	//return CFsProxy::GetInstance().ExtenCall(uniqueId(), m_pHostChan, CallerNum, m_DestNumber);
+	return CFsProxy::GetInstance().ExtenVideoCall(uniqueId(), m_pHostChan, CallerNum, m_DestNumber);
 }
 
 /*****************************************************************