diff --git a/Debug_Unicode/SmsCenter.exe b/Debug_Unicode/SmsCenter.exe index a9a6ca9..18377c1 100644 Binary files a/Debug_Unicode/SmsCenter.exe and b/Debug_Unicode/SmsCenter.exe differ diff --git a/Debug_Unicode/SmsCenter.tlog/CL.command.1.tlog b/Debug_Unicode/SmsCenter.tlog/CL.command.1.tlog index 2db05af..69f7935 100644 Binary files a/Debug_Unicode/SmsCenter.tlog/CL.command.1.tlog and b/Debug_Unicode/SmsCenter.tlog/CL.command.1.tlog differ diff --git a/Debug_Unicode/SmsCenter.tlog/CL.read.1.tlog b/Debug_Unicode/SmsCenter.tlog/CL.read.1.tlog index 8eb1c85..b548f0d 100644 Binary files a/Debug_Unicode/SmsCenter.tlog/CL.read.1.tlog and b/Debug_Unicode/SmsCenter.tlog/CL.read.1.tlog differ diff --git a/Debug_Unicode/SmsCenter.tlog/CL.write.1.tlog b/Debug_Unicode/SmsCenter.tlog/CL.write.1.tlog index c1aacd3..10582cc 100644 Binary files a/Debug_Unicode/SmsCenter.tlog/CL.write.1.tlog and b/Debug_Unicode/SmsCenter.tlog/CL.write.1.tlog differ diff --git a/Debug_Unicode/SmsCenter.tlog/link.read.1.tlog b/Debug_Unicode/SmsCenter.tlog/link.read.1.tlog index c6f7b16..1e58a41 100644 Binary files a/Debug_Unicode/SmsCenter.tlog/link.read.1.tlog and b/Debug_Unicode/SmsCenter.tlog/link.read.1.tlog differ diff --git a/Debug_Unicode/SmsCenter.tlog/link.write.1.tlog b/Debug_Unicode/SmsCenter.tlog/link.write.1.tlog index 55ef865..bf2408e 100644 Binary files a/Debug_Unicode/SmsCenter.tlog/link.write.1.tlog and b/Debug_Unicode/SmsCenter.tlog/link.write.1.tlog differ diff --git a/Debug_Unicode/vc143.idb b/Debug_Unicode/vc143.idb index 1da55e4..e7ceb6d 100644 Binary files a/Debug_Unicode/vc143.idb and b/Debug_Unicode/vc143.idb differ diff --git a/ProcessSocket2.cpp b/ProcessSocket2.cpp index 65554be..27c8972 100644 --- a/ProcessSocket2.cpp +++ b/ProcessSocket2.cpp @@ -15750,6 +15750,7 @@ try m_AdoRS.GetCollect( _T("Mon_ReportFail") , pTD2DataRet->Mon_ReportFail); m_AdoRS.GetCollect(_T("OftenUse"), pTD2DataRet->lOftenUse); m_AdoRS.GetCollect(_T("LoginName"), pTD2DataRet->szLoginName); + m_AdoRS.GetCollect(_T("BFPriority"), pTD2DataRet->lBFPriority); m_AdoRS.MoveNext(); pTD2DataRet ++; } @@ -15802,6 +15803,7 @@ try CString strXYTDID; CString strOftenUse; CString strLoginName; + CString strBFPriority; strTDID.Format( _T("%d") , pData->lTDID ); strTDType.Format( _T("%d") , pData->lTDType ); @@ -15823,6 +15825,7 @@ try strXYTDID.Format( _T("%d") , pData->lXYTDID ); strOftenUse.Format(_T("%d"), pData->lOftenUse); strLoginName = pData->szLoginName; strLoginName.Replace(_T("'"), _T("''")); + strBFPriority.Format(_T("%d"), pData->lBFPriority); strSelect = CString("update TD2 set ") + CString("TDType='") + strTDType + CString("',") + @@ -15846,6 +15849,7 @@ try #endif CString(",OftenUse=") + strOftenUse + CString(" ") + CString(",LoginName='") + strLoginName + CString("' ") + + CString(",BFPriority='") + strBFPriority + CString("' ") + CString("where TDID=") + strTDID ; BOOL b = m_AdoRS.Open( strSelect ); @@ -15912,6 +15916,7 @@ try CString strXYTDID; CString strOftenUse; CString strLoginName; + CString strBFPriority; strTDID.Format( _T("%d") , pData->lTDID ); strTDType.Format( _T("%d") , pData->lTDType ); @@ -15933,29 +15938,31 @@ try strXYTDID.Format( _T("%d") , pData->lXYTDID ); strOftenUse.Format(_T("%d"), pData->lOftenUse); strLoginName = pData->szLoginName; strLoginName.Replace(_T("'"), _T("''")); + strBFPriority.Format(_T("%d"), pData->lBFPriority); - strSelect = CString("insert into TD2 (TDType,Name,AccessPort,BZ,Status,Ability,Limits,TDNum,Mode,SendRet,ContentLen,LongContentLen,SignLen,XYLen,XYTDID,DefaultTD,OftenUse,LoginName) values(") + - CString(" '") + strTDType + CString("',") + - CString(" '") + strName + CString("',") + - CString(" '") + strAccessPort + CString("',") + - CString(" '") + strBZ + CString("',") + - CString(" '") + strStatus + CString("',") + - CString(" '") + strAbility + CString("',") + - CString(" '") + strLimits + CString("',") + - CString(" '") + strTDNum + CString("',") + - CString(" '") + strMode + CString("',") + - CString(" '") + strSendRet + CString("',") + - CString(" '") + strContentLen + CString("',") + - CString(" '") + strLongContentLen + CString("',") + - CString(" '") + strSignLen + CString("',") + - CString(" '") + strXYLen + CString("',") + - CString(" '") + strXYTDID + CString("',") + - CString(" '") + strDefaultTD + CString("',") + - CString(" '") + strOftenUse + CString("',")+ - CString(" '") + strLoginName + CString("')"); + strSelect = CString("insert into TD2 (TDType,Name,AccessPort,BZ,Status,Ability,Limits,TDNum,Mode,SendRet,ContentLen,LongContentLen,SignLen,XYLen,XYTDID,DefaultTD,OftenUse,LoginName,BFPriority) values(") + + CString(" '") + strTDType + CString("',") + + CString(" '") + strName + CString("',") + + CString(" '") + strAccessPort + CString("',") + + CString(" '") + strBZ + CString("',") + + CString(" '") + strStatus + CString("',") + + CString(" '") + strAbility + CString("',") + + CString(" '") + strLimits + CString("',") + + CString(" '") + strTDNum + CString("',") + + CString(" '") + strMode + CString("',") + + CString(" '") + strSendRet + CString("',") + + CString(" '") + strContentLen + CString("',") + + CString(" '") + strLongContentLen + CString("',") + + CString(" '") + strSignLen + CString("',") + + CString(" '") + strXYLen + CString("',") + + CString(" '") + strXYTDID + CString("',") + + CString(" '") + strDefaultTD + CString("',") + + CString(" '") + strOftenUse + CString("',") + + CString(" '") + strLoginName + CString("',") + + CString(" '") + strBFPriority + CString("')"); - BOOL b = m_AdoRS.Open( strSelect ); + BOOL b = m_AdoRS.Open(strSelect); //long lCount = m_AdoRS.GetRecordCount(); if ( b ) { diff --git a/SmsCenterDlg.cpp b/SmsCenterDlg.cpp index 75fa899..ec204b7 100644 --- a/SmsCenterDlg.cpp +++ b/SmsCenterDlg.cpp @@ -20870,7 +20870,8 @@ long CSmsCenterDlg::AutoSend_ReportProcess_ReSend(CAdoRecordSet* pAdoRS, long lS strAllSendRet += str; pAdoRS->MoveNext(); } - str.Format(_T("select * from td2 with(nolock) where Status=1 and TDType=%d and GGTD<>1 and Mode=0 and Ability=%d and TDNum not in (2,3) and SendRet not in (%s) order by tdnum"), lRecvNumType, lTDMsgType, strAllSendRet); + //str.Format(_T("select * from td2 with(nolock) where Status=1 and TDType=%d and GGTD<>1 and Mode=0 and Ability=%d and TDNum not in (2,3) and SendRet not in (%s) order by tdnum"), lRecvNumType, lTDMsgType, strAllSendRet); + str.Format(_T("select * from td2 with(nolock) where Status=1 and TDType=%d and SendRet not in (%s) and Ability=%d and Mode=0 and BFPriority>0 order by BFPriority desc"), lRecvNumType, strAllSendRet, lTDMsgType ); if (!pAdoRS->Open(str) || pAdoRS->IsEOF()) //已经没有可用通道了。 { lReSendType = 2;