ivr挂机删除该来电排队，修改firststep可选择配置动态网关。

CTI/IvrFlow.cpp

@@ -92,14 +92,21 @@ void CIvrFlow::onPduMessage(CPduEntity &PduEntity)
 		__procCancelQuene(PduEntity);
 		break;
 
-	case PDU_CMD_IVR_TURN_AGENT:			// 转人工
 	case PDU_CMD_IVR_HANGUP:				// Ivr挂机
+	{
+		CPduEntity CmdCancelQuene(PDU_CMD_IVR_QUEUE_CANCEL); // ych 2018.7.3
+		CmdCancelQuene.SetDataInt(1, PduEntity.GetDataInt(1));
+		CmdCancelQuene.SetDataULong(2, PduEntity.GetDataULong(2));
+		__procCancelQuene(CmdCancelQuene);
+		ILogger::getInstance().log(LOG_CLASS_BUSI, LOG_LEVEL_NORMAL, "{procLineHangUp}: Ivr挂机前取消掉来电排队"); // ych 2018.5.31
+	}
+	case PDU_CMD_IVR_TURN_AGENT:			// 转人工	
 	case PDU_CMD_IVR_PLAY_DTMF:				// IVR通知放音收按键
 	case PDU_CMD_IVR_CALL_OUT:				// IVR自动外呼
 	case PDU_CMD_IVR_TURN_OUTLINE:			// IVR呼叫转移
 	case PDU_CMD_IVR_FAX:					// IVR通知收发传真
 	case PDU_CMD_IVR_LEAVE_WORD:			// IVR通知留言
-		__transmitToTask(PduEntity);				
+		__transmitToTask(PduEntity);
 		break;
 	}
 }

FirstStep/ConfigLoader.cpp

@@ -91,7 +91,25 @@ bool CConfigLoader::__loadExtenCfg( void )
 ****************************************************************/
 bool CConfigLoader::__loadSipAccountCfg( void )
 {
-	IOtlRecordset* pAccountRcd = IOtlConnection::getInstance()->QueryRecords(_T("SELECT id, account, auth_account, password, proxy_addr, proxy_port, reg, reg_interval, IsDynamicGw FROM conf_sip_account ORDER BY id ASC"));
+	long Count=IOtlConnection::getInstance()->GetSingleDataInt(_T("select count(*) from information_schema.columns where table_name = 'conf_sip_account' and column_name = 'IsDynamicGw'"));
+	IOtlRecordset* pAccountRcd = NULL;
+	BOOL bAddOk = FALSE;
+	if (Count == 1)
+	{
+		pAccountRcd = IOtlConnection::getInstance()->QueryRecords(_T("SELECT id, account, auth_account, password, proxy_addr, proxy_port, reg, reg_interval, IsDynamicGw FROM conf_sip_account ORDER BY id ASC"));
+	}
+	else if (Count == 0)
+	{
+		bAddOk = IOtlConnection::getInstance()->ExecCommand(_T("ALTER TABLE conf_sip_account ADD IsDynamicGw VARCHAR (10) NOT NULL DEFAULT 'false'"));
+		if (bAddOk == TRUE)
+		{
+			pAccountRcd = IOtlConnection::getInstance()->QueryRecords(_T("SELECT id, account, auth_account, password, proxy_addr, proxy_port, reg, reg_interval, IsDynamicGw FROM conf_sip_account ORDER BY id ASC"));
+		}
+		else
+		{
+			pAccountRcd = IOtlConnection::getInstance()->QueryRecords(_T("SELECT id, account, auth_account, password, proxy_addr, proxy_port, reg, reg_interval FROM conf_sip_account ORDER BY id ASC"));
+		}
+	}
 	if (NULL == pAccountRcd)
 		return false;
 
@@ -115,10 +133,17 @@ bool CConfigLoader::__loadSipAccountCfg( void )
 			pSipAccount->IsReg = false;
 		pSipAccount->RegInterval = pAccountRcd->GetValueIntByIndex(8);
 
-		if (lstrcmp(_T("true"), pAccountRcd->GetValueStrByIndex(9)) == 0)
-			pSipAccount->IsDynamicGw = true;
+		if (Count == 1 || bAddOk == TRUE)
+		{
+			if (lstrcmp(_T("true"), pAccountRcd->GetValueStrByIndex(9)) == 0)
+				pSipAccount->IsDynamicGw = true;
+			else
+				pSipAccount->IsDynamicGw = false;
+		}
 		else
+		{ 
 			pSipAccount->IsDynamicGw = false;
+		}
 
 		Config.m_SipAccount.AddTail(pSipAccount);
 	} // end while