添加获取部门分机状态接口

MidWare_WinStandard1.0-zmd/3rd/hybase/PduLinkInc.h

@@ -147,7 +147,7 @@ typedef enum tagPDU_CMD_TYPE
 	PDU_CMD_AGENT_VIDEO_REQ_EXTEN   = 130,      // 请求注册视频分机号
 	PDU_CMD_AGENT_VIDEO_REQ_AGENT   = 131,      // 请求空闲坐席
 	PDU_CMD_AGENT_VIDEO_RECOVER_EXTEN = 132,    // 释放请求的视频分机号
-
+	PDU_CMD_EXTEN_STATE_LIST_ZMD = 146,      // 驻马店获取分机状态
 
 	// ACD命令集（201－300）
 	PDU_CMD_ACD_AGENT_STATE			= 201,		// ACD通知坐席状态(包括订阅状态，用工号区分自己还是被订阅者)
@@ -184,6 +184,7 @@ typedef enum tagPDU_CMD_TYPE
 	PDU_CMD_IVR_WAITER_COUNT        = 412,      // IVR通知CTI 当前排队人数   2019-9-6 配合4.0acd返回排队人数
 	PDU_CMD_ACD_FREEAGENT           = 413,      //ACD通知空闲坐席数量
 	PDU_CMD_CTI_TRUNKUSE_COUNT      = 414,      //ACD 通知中继利用数
+	PDU_CMD_AGENT_GET_AGENTLIST     = 415,      // 获取坐席列表  转移电话时使用
 
 	// Stable Core命令集（501－600）
 	PDU_CMD_SC_RES_DETAIL			= 501,		// SC上报资源明细

MidWare_WinStandard1.0-zmd/3rd/hybase/RcfClient.h

@@ -0,0 +1,27 @@
+// pch.h: 这是预编译标头文件。
+// 下方列出的文件仅编译一次，提高了将来生成的生成性能。
+// 这还将影响 IntelliSense 性能，包括代码完成和许多代码浏览功能。
+// 但是，如果此处列出的文件中的任何一个在生成之间有更新，它们全部都将被重新编译。
+// 请勿在此处添加要频繁更新的文件，这将使得性能优势无效。
+
+#ifndef PCH_H
+#define PCH_H
+
+// 添加要在此处预编译的标头
+#include <string>
+#include <vector>
+
+bool pushAgentList(int agentId, std::string agentList);
+bool getAgentList(int agentId, std::string& agentList);
+bool pushRedis(std::vector<std::string> & val);
+bool pushRedis(std::string & val);
+bool pushCallIndex(std::string callIndex);
+bool getCallIndex(int index, std::string& callIndex);
+bool pushSubmitData(int nEventType, std::string state);
+bool getSubmitData(int nEventType, std::string& state);
+
+// 驻马店专用
+bool pushZmdExtenStateList(std::string& extList);
+bool getZmdExtenStateList(std::string& extList);
+
+#endif //PCH_H

MidWare_WinStandard1.0-zmd/3rd/hybase/RcfConfig.yml

@@ -0,0 +1,3 @@
+Rcf:
+  IP: 127.0.0.1
+  PORT: 5001

MidWare_WinStandard1.0-zmd/ACD/ACD.vcxproj

@@ -47,7 +47,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Microsoft Visual Studio\third-Part\yaml-cpp;C:\Microsoft Visual Studio\third-Part\jsoncpp;C:\Microsoft Visual Studio\third-Part\boost-1_69;$(ProjectDir)</IncludePath>
+    <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir);$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -131,6 +131,7 @@
     <ClInclude Include="AgentGroup.h" />
     <ClInclude Include="AgentOffice.h" />
     <ClInclude Include="Config.h" />
+    <ClInclude Include="DepttelextOffice.h" />
     <ClInclude Include="StrategyLoopByAgentId.h" />
     <ClInclude Include="Exten.h" />
     <ClInclude Include="ExtenCtrl.h" />
@@ -183,6 +184,7 @@
     <ClCompile Include="AgentGroup.cpp" />
     <ClCompile Include="AgentOffice.cpp" />
     <ClCompile Include="Config.cpp" />
+    <ClCompile Include="DepttelextOffice.cpp" />
     <ClCompile Include="StrategyLoopByAgentId.cpp" />
     <ClCompile Include="Exten.cpp" />
     <ClCompile Include="ExtenCtrl.cpp" />

MidWare_WinStandard1.0-zmd/ACD/ACD.vcxproj.filters

@@ -50,6 +50,9 @@
     <Filter Include="BLL\VideoExten">
       <UniqueIdentifier>{977b6070-655f-4e93-acbf-f9092e970497}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Depttelext">
+      <UniqueIdentifier>{2f5fa641-7ccf-4c49-9b22-7a579bccc52d}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
@@ -233,6 +236,9 @@
     <ClInclude Include="VideoOffice.h">
       <Filter>BLL\VideoExten</Filter>
     </ClInclude>
+    <ClInclude Include="DepttelextOffice.h">
+      <Filter>Depttelext</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -371,6 +377,9 @@
     <ClCompile Include="VideoOffice.cpp">
       <Filter>BLL\VideoExten</Filter>
     </ClCompile>
+    <ClCompile Include="DepttelextOffice.cpp">
+      <Filter>Depttelext</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ACD.rc">

MidWare_WinStandard1.0-zmd/ACD/AcdCore.cpp

@@ -46,6 +46,7 @@ void CAcdCore::__onAgentStateUpdated( UINT AgentId )
 	// 如果有座席变为空闲，通知来电队列刷新排队
 	if(State == AGENT_STATE_FREE)
 		m_QueueMgr.onAgentFree(pAgent);
+
 }
 
 /*****************************************************************
@@ -64,6 +65,9 @@ void CAcdCore::__onPhoneStateUpdated( UINT ExtenId )
 
 	// 通知事件订阅
 	m_SubjectRepository.onPhoneStateUpdated(pExten->assoAgent(), pExten->id(), pExten->state());
+
+	// 2022-09-01 驻马店 保存分机号，坐席状态
+	m_DepttelextOffice.UpdateDepttelext(pExten->id(), pExten->state());
 }
 
 /*****************************************************************
@@ -759,14 +763,26 @@ void CAcdCore::__onCmdDataSendToAgent(CPduEntity * a_pCmd)
 	}
 	std::vector<int> VecAgentID = m_AgentOffice.getAgentIDAll();
 
-	for (auto iter = VecAgentID.begin(); iter != VecAgentID.end(); iter++)
+	bool isSuccess = CNetworkAcd::GetInstance().send2Server(a_pCmd);
+	ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{Core}: 通知[%d][%s],当前数量：%d"), a_pCmd->GetCmdType(), isSuccess ? "成功" : "失败", count);
+}
+
+void CAcdCore::__onCmdGetAgentList(CPduEntity * a_pCmd)
+{
+	CString szAgentList;
+	m_AgentOffice.getAllAgentStateList(szAgentList);
+	int t_agent_id = a_pCmd->GetDataUInt(1);
+	if (!pushAgentList(t_agent_id, szAgentList.GetBuffer(0)))  // 如果rcf失败在使用原来参数传递
 	{
-		bool isSuccess = CNetworkAcd::GetInstance().send2Server(a_pCmd);
-		if (isSuccess)
-			ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{Core}: 通知坐席%d 成功,当前数量：%d"), *iter, count);
-		else
-			ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{Core}: 通知坐席%d 失败,当前数量：%d"), *iter, count);
+		if (szAgentList.GetLength() >= 512)
+		{
+			szAgentList = szAgentList.Left(511);
+			ILogger::getInstance().log(LOG_CLASS_SOCKET, LOG_LEVEL_WARNING, _T("ACD -> HP-SERVER,坐席[%lu]获取坐席列表字符超出被截取 "), a_pCmd->GetDataUInt(1));
+		}
+		a_pCmd->SetDataString(2, szAgentList);
 	}
+	szAgentList.ReleaseBuffer();
+	CNetworkAcd::GetInstance().send2Server(a_pCmd);
 }
 
 void CAcdCore::__onCmdAgentReqExten(CPduEntity * a_pCmd)
@@ -800,6 +816,13 @@ void CAcdCore::__onCmdAgentRecoverAgent(CPduEntity * a_pCmd)
 	CNetworkAcd::GetInstance().send2Server(a_pCmd);
 }
 
+void CAcdCore::__onCmdExtStateList(CPduEntity * a_pCmd)
+{
+	std::string extStateList = m_DepttelextOffice.GetAllDeptTelext();
+	pushZmdExtenStateList(extStateList);
+	CNetworkAcd::GetInstance().send2Server(a_pCmd);
+}
+
 /*****************************************************************
 **【函数名称】	stage1Start
 **【函数功能】	第一阶段启动
@@ -830,6 +853,14 @@ bool CAcdCore::stage1Start( void )
 		AfxMessageBox("加载视频账号配置信息失败");
 		return false;
 	}
+	// 加载分机号部门信息失败
+	if (!m_DepttelextOffice.InitDepttelext())
+	{
+		IOtlConnection::getInstance()->Disconnect();
+		AfxMessageBox("加载分机部门信息失败");
+		return false;
+	}
+	std::cout << m_DepttelextOffice.GetAllDeptTelext() << std::endl;
 	return true;
 }
 
@@ -1013,6 +1044,10 @@ void CAcdCore::onRecvCommand( CPduEntity* a_pPduEntity )
 		__onCmdDataSendToAgent(a_pPduEntity);
 		break;
 
+	case PDU_CMD_AGENT_GET_AGENTLIST:
+		__onCmdGetAgentList(a_pPduEntity);
+		break;
+
 	case PDU_CMD_AGENT_VIDEO_REQ_EXTEN:      // 请求注册视频分机号
 		__onCmdAgentReqExten(a_pPduEntity);
 		break;
@@ -1022,6 +1057,9 @@ void CAcdCore::onRecvCommand( CPduEntity* a_pPduEntity )
 	case PDU_CMD_AGENT_VIDEO_RECOVER_EXTEN:    // 释放请求的视频分机号
 		__onCmdAgentRecoverAgent(a_pPduEntity);
 		break;
+	case PDU_CMD_EXTEN_STATE_LIST_ZMD:  // 分机状态列表
+		__onCmdExtStateList(a_pPduEntity);
+		break;
 	default:
 		return;
 	} // end switch

MidWare_WinStandard1.0-zmd/ACD/AcdCore.h

@@ -14,6 +14,7 @@
 #include "SubjectRepository.h"
 #include "SoftAuther.h"
 #include "VideoOffice.h"
+#include "DepttelextOffice.h"
 
 class CAgent;
 class CExten;
@@ -77,10 +78,14 @@ private:
 
 	void __onCmdDataSendToAgent(CPduEntity* a_pCmd);      //向Agent转发当前通话中线路数量
 
+	void __onCmdGetAgentList(CPduEntity* a_pCmd);      // 获取坐席列表
+
 	void __onCmdAgentReqExten(CPduEntity* a_pCmd);       // 请求注册视频分机号
 	void __onCmdAgentReqAgent(CPduEntity* a_pCmd);       // 请求空闲坐席
 	void __onCmdAgentRecoverAgent(CPduEntity* a_pCmd);   // 释放请求的视频分机号
 
+	void __onCmdExtStateList(CPduEntity* a_pCmd);        // 获取分机状态列表
+
 private:
 	CExtenCtrl m_ExtenCtrl;                         // 内线分机管理类
 	CAgentOffice m_AgentOffice;						// 座席管理类
@@ -88,7 +93,7 @@ private:
 	CSubjectRepository m_SubjectRepository;			// 发布主题管理类
 
 	CVideoOffice m_VideoOffice;                     // 视频账号管理类
-
+	CDepttelextOffice m_DepttelextOffice;
 	SoftAuther m_Auther;                 //授权
 };
 

MidWare_WinStandard1.0-zmd/ACD/AgentOffice.cpp

@@ -421,6 +421,24 @@ void CAgentOffice::getStateSpecAgentList( AGENT_LIST_SPEC_STATE SpecState, CStri
 	} // end while
 }
 
+void CAgentOffice::getAllAgentStateList(CString & AgentList)
+{
+	CSingleLock Lock(&m_Cs4AgentMap, TRUE);
+	UINT Key;
+	CAgent* pAgent = NULL;
+	CString agent;
+	POSITION pos = m_AgentMap.GetStartPosition();
+	while (pos != NULL)
+	{
+		m_AgentMap.GetNextAssoc(pos, Key, pAgent);
+		if (pAgent)
+		{
+			agent.Format("%d,%d,%d,%s|", pAgent->id(), pAgent->assoExten(), pAgent->state(), pAgent->group());
+			AgentList += agent;
+		}
+	}
+}
+
 std::vector<int> CAgentOffice::getAgentIDAll()
 {
 	UINT id = 0;

MidWare_WinStandard1.0-zmd/ACD/AgentOffice.h

@@ -62,6 +62,12 @@ public:
 	// 获取指定状态的座席列表
 	void getStateSpecAgentList(AGENT_LIST_SPEC_STATE SpecState, CString& AgentList);
 
+	// 获取所有坐席状态列表
+	void getAllAgentStateList(CString& AgentList);
+	
+	// 
+	
+
 	std::vector<int> getAgentIDAll();   //获取所有座席AgentID
 
 	//std::map<UINT, CAgentProperty>& GetAgentPropertyMap();   // 2020-03-05 屏蔽   该方法未找到使用的地方（没有被调用）

MidWare_WinStandard1.0-zmd/ACD/DepttelextOffice.cpp

@@ -0,0 +1,82 @@
+#include "stdafx.h"
+#include "DepttelextOffice.h"
+#include <iostream>
+
+CDepttelextOffice::~CDepttelextOffice()
+{
+	auto it = m_DeptTelextmap.begin();
+	DeptTelext *pDeptTelext = nullptr;
+	while (it != m_DeptTelextmap.end())
+	{
+		pDeptTelext = it->second;
+		if (pDeptTelext) {
+			delete pDeptTelext;
+			pDeptTelext = nullptr;
+		}
+		++it;
+	}
+}
+
+bool CDepttelextOffice::InitDepttelext()
+{
+	CString sql;
+	sql.Format("SELECT [Id],[Name],[Telephone],[Extension] ,[CreateTime] 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())
+	{
+		record->MoveNextRow();
+		 
+		DeptTelext *pDeptTelext = new DeptTelext();
+		pDeptTelext->Name = record->GetValueStr("Name");
+		pDeptTelext->Telephone = record->GetValueStr("Telephone");
+		pDeptTelext->Extension = record->GetValueStr("Extension");
+		pDeptTelext->State = 8;// 默认移除
+
+		UINT extenId = _ttoi(pDeptTelext->Extension);
+		m_DeptTelextmap.insert(std::make_pair(extenId, pDeptTelext));
+
+		std::cout << pDeptTelext->Name <<" - "<< extenId << " - " << pDeptTelext->Telephone << " - " << pDeptTelext->Extension << std::endl;
+	}
+
+	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)
+{
+	auto it = m_DeptTelextmap.find(extno);
+	if (it == m_DeptTelextmap.end()) return;
+	if (it->second) {
+		it->second->State = state;
+	}
+}
+
+std::string CDepttelextOffice::GetAllDeptTelext()
+{
+	Json::Value root;
+	Json::Value body;
+	Json::FastWriter writer;
+
+	auto it = m_DeptTelextmap.begin();
+	DeptTelext *pDeptTelext = nullptr;
+	while (it != m_DeptTelextmap.end()){
+		pDeptTelext = it->second;
+		if (pDeptTelext) {
+			body["Name"] = pDeptTelext->Name.GetBuffer(0);
+			body["Telephone"] = pDeptTelext->Telephone.GetBuffer(0);
+			body["AgentExten"] = pDeptTelext->Extension.GetBuffer(0);
+			body["State"] = pDeptTelext->State;
+			root.append(body);
+		}
+		++it;
+	}
+	return writer.write(root);
+}

MidWare_WinStandard1.0-zmd/ACD/DepttelextOffice.h

@@ -0,0 +1,27 @@
+#pragma once
+#include <map>
+#include <string>
+
+class CDepttelextOffice
+{
+public:
+	CDepttelextOffice() {};
+	~CDepttelextOffice();
+
+	bool InitDepttelext();
+	void UpdateDepttelext(UINT extno, int state);
+	std::string GetAllDeptTelext();
+
+private:
+	typedef struct tagtel_depttelext {
+		int Id;
+		CString Name;
+		CString Telephone;
+		CString Extension;
+		CString AgentID;
+		int State;
+	}DeptTelext;
+
+	std::map<UINT, DeptTelext*> m_DeptTelextmap;  // 2022-09-01
+};
+

MidWare_WinStandard1.0-zmd/ACD/stdafx.h

@@ -54,7 +54,12 @@
 
 //#define _VERSION_EHANG
 
+#include <string>
+#include <json/json.h>
+#pragma comment(lib,"jsoncpp_static.lib")
 
+#include "RcfClient.h"
+#pragma comment(lib,"RcfClient.lib")
 
 #ifdef _UNICODE
 #if defined _M_IX86