acd,分机取消注册时，清理视频话机资源

MidWare_WinStandard1.0-zmd/ACD/AcdCore.cpp

@@ -613,8 +613,10 @@ void CAcdCore::__onCmdCtiExtenInfo( CPduEntity* a_pCmd )
 			if (Agentid != 0)
 				__removeAgent(Agentid, ExtID, 0);			// 迁出坐席
 
-			//删除分机
+			// 删除分机
 			m_ExtenCtrl.removeExten(ExtID);
+			// 2023-01-17 分机取消注册时，清理分机使用资源
+			m_VideoOffice.recoverVideoExten(ExtID, true);
 		}
 	}
 	else
@@ -858,7 +860,6 @@ bool CAcdCore::stage1Start( void )
 	{
 		IOtlConnection::getInstance()->Disconnect();
 		AfxMessageBox("加载分机部门信息失败");
-		return false;
 	}
 	std::cout << m_DepttelextOffice.GetAllDeptTelext() << std::endl;
 	return true;

MidWare_WinStandard1.0-zmd/ACD/VideoOffice.cpp

@@ -58,14 +58,18 @@ bool CVideoOffice::findVideoExten(uint32_t & a_VideoExtId, std::string & a_Video
 	return false;
 }
 
-bool CVideoOffice::recoverVideoExten(uint32_t a_VideoExtId)
+bool CVideoOffice::recoverVideoExten(uint32_t a_VideoExtId, bool bIsRm)
 {
 	std::unique_lock<std::mutex> lock(mut);
 	auto it = m_VideoExtens.find(a_VideoExtId);
 	if (it != m_VideoExtens.end())
 	{
 		it->second->isUsed() = false;
-		ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, _T("{CVideoOffice}: 释放视频分机号[%lu]状态[%s]"), a_VideoExtId, it->second->isUsed() ? "不可用" : "可用");
+		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() ? "不可用" : "可用");
+
 	}
 	
 	{

MidWare_WinStandard1.0-zmd/ACD/VideoOffice.h

@@ -11,7 +11,7 @@ public:
 
 	bool initVideoExten();
 	bool findVideoExten(uint32_t &a_VideoExtId,std::string &a_VideoExtPwd);
-	bool recoverVideoExten(uint32_t a_VideoExtId);
+	bool recoverVideoExten(uint32_t a_VideoExtId, bool bIsRm = false);
 
 	void close();