督办状态及时恢复

MidWare_WinStandard1.0-zmd/ACD/AcdCore.cpp

@@ -364,6 +364,12 @@ void CAcdCore::__onCmdAgentLogout( CPduEntity* a_pCmd )
 	// 显示日志
 	ILogger::getInstance().log(LOG_CLASS_SOCKET, LOG_LEVEL_NORMAL, _T("{Core}: AGENT -> ACD, CMD = [座席签出], Agent = %lu, Exten = %lu"), AgentId, ExtId);
 
+	//2023-10-08  判断分机是否是督办部门分机，是更新离线，成功，说明是督办
+	if (m_DepttelextOffice.UpdateDepttelext(ExtId, 8)) {
+		return;
+	}
+
+
 	// ych 2018.5.16
 	//  m_AgentOffice.setAgentState(AgentId, AGENT_STATE_LOGOUT);
 	if (m_AgentOffice.setAgentState(AgentId, AGENT_STATE_LOGOUT))
@@ -401,10 +407,13 @@ void CAcdCore::__onCmdAgentSetState( CPduEntity* a_pCmd )
 	// 得到座席信息
 	UINT AgentId = a_pCmd->GetDataUInt(2);
 	AGENT_STATE State = static_cast<AGENT_STATE>(a_pCmd->GetDataUInt(3));
-
+	UINT ExtID = a_pCmd->GetDataUInt(1);
 	// 显示日志
-	ILogger::getInstance().log(LOG_CLASS_SOCKET, LOG_LEVEL_NORMAL, _T("{Core}: AGENT -> ACD, CMD = [座席状态设置], Agent = %lu, State = %d"), AgentId, State);
-
+	ILogger::getInstance().log(LOG_CLASS_SOCKET, LOG_LEVEL_NORMAL, _T("{Core}: AGENT -> ACD, CMD = [座席状态设置], Agent = %lu,Exten = %lu State = %d"), AgentId, ExtID, State);
+	
+	if (State == 2 && m_DepttelextOffice.UpdateDepttelext(ExtID, 1)) {
+		return;
+	}
 	// 设置座席逻辑状态
 	if(m_AgentOffice.setAgentState(AgentId, State))
 		a_pCmd->SetDataBool(0, true);

MidWare_WinStandard1.0-zmd/ACD/DepttelextOffice.cpp

@@ -49,29 +49,34 @@ bool CDepttelextOffice::InitDepttelext()
 
 	ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{CDepttelextOffice}: 分机号码列表结束初始化"));
 	IOtlRecordset::DestroyInstance(record);		// 释放记录集
+
+	// 定时器初始化
+	//m_PollTimer.SetTimedEvent(this, &CDepttelextOffice::__onTimerPoll);
+	//m_PollTimer.Start(1000 * 60);   // 每分钟一次
+
 	return true;
 }
 
-void CDepttelextOffice::UpdateDepttelext(UINT extno, int state)
+bool CDepttelextOffice::UpdateDepttelext(UINT extno, int state)
 {
 	auto it = m_DeptTelextmap.find(extno);
-	if (it == m_DeptTelextmap.end()) return;
+	if (it == m_DeptTelextmap.end()) return false;
 	if (it->second) {
-		it->second->State = state;
+		it->second->UpdateState(state);
 	}
+	return true;
 }
 
 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) {
+			Json::Value body;
 			body["Name"] = pDeptTelext->Name.GetBuffer(0);
 			body["Telephone"] = pDeptTelext->Telephone.GetBuffer(0);
 			body["AgentExten"] = pDeptTelext->Extension.GetBuffer(0);
@@ -82,3 +87,12 @@ std::string CDepttelextOffice::GetAllDeptTelext()
 	}
 	return writer.write(root);
 }
+
+void CDepttelextOffice::__onTimerPoll(void)
+{
+	auto it = m_DeptTelextmap.begin();
+	DeptTelext *pDeptTelext = nullptr;
+	while (it != m_DeptTelextmap.end()) {
+		 it->second->UpdateTimeCount();
+	}
+}

MidWare_WinStandard1.0-zmd/ACD/DepttelextOffice.h

@@ -2,6 +2,8 @@
 #include <map>
 #include <string>
 #include <iostream>
+#include <atomic>
+#include <TemplateTimer.h>
 
 class CDepttelextOffice
 {
@@ -10,10 +12,14 @@ public:
 	~CDepttelextOffice();
 
 	bool InitDepttelext();
-	void UpdateDepttelext(UINT extno, int state);
+	bool UpdateDepttelext(UINT extno, int state);
 	std::string GetAllDeptTelext();
 
 private:
+	// 定时器处理
+	void __onTimerPoll(void);			// 轮询处理
+
+private:
 	typedef struct tagtel_depttelext {
 		int Id;
 		CString Name;
@@ -21,11 +27,37 @@ private:
 		CString Extension;
 		CString AgentID;
 		int State;
+		std::atomic<std::int64_t> TimeCount;
+		
+		tagtel_depttelext() {
+			State = 8;
+			TimeCount.store(0);
+		}
+		void UpdateState(int state) {
+			this->State = state;
+			if (this->State == 1) { // 空闲开始计时时间
+				this->TimeCount.store(0);
+			}
+		}
+		void UpdateTimeCount() {
+			if (this->State == 1) { // 空闲就计时时间
+				auto tCount = this->TimeCount.load() + 1;
+				if (tCount > 19) { // 空闲时间超过，状态改为8-离线
+					this->State = 8;
+				}
+				else {
+					this->TimeCount.store(tCount);
+				}
+			}
+		}
 		void print() {
 			std::cout << Name << "-" << Telephone << "-" << Extension << "-" << AgentID << "-" << State << std::endl;
 		}
 	}DeptTelext;
 
 	std::map<UINT, DeptTelext*> m_DeptTelextmap;  // 2022-09-01
+
+	TTimer<CDepttelextOffice> m_PollTimer;  // 定时检测是否更改状态为签出
+
 };
 

MidWare_WinStandard1.0-zmd/ACD/VideoOffice.cpp

@@ -60,16 +60,20 @@ bool CVideoOffice::findVideoExten(uint32_t & a_VideoExtId, std::string & a_Video
 
 bool CVideoOffice::recoverVideoExten(uint32_t a_VideoExtId, bool bIsRm)
 {
+	bool ret = false;
 	std::unique_lock<std::mutex> lock(mut);
 	auto it = m_VideoExtens.find(a_VideoExtId);
 	if (it != m_VideoExtens.end())
 	{
+		ret = true;
 		it->second->isUsed() = false;
 		if (!bIsRm)
 			ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{CVideoOffice}: 释放视频分机号[%lu]状态[%s]"), a_VideoExtId, it->second->isUsed() ? "不可用" : "可用");
 		else
 			ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{CVideoOffice}: 释放视频分机号[%lu]状态[%s],话机取消注册"), a_VideoExtId, it->second->isUsed() ? "不可用" : "可用");
-
+	}
+	else {
+		return ret;
 	}
 	
 	{
@@ -83,7 +87,7 @@ bool CVideoOffice::recoverVideoExten(uint32_t a_VideoExtId, bool bIsRm)
 		}
 		ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{CVideoOffice}: 视频分机信息\n[%s]"),str.GetBuffer(0));
 	}
-	return true;
+	return ret;
 }
 
 void CVideoOffice::close()