|
@@ -433,7 +433,7 @@ unsigned int CCardIssuerFSM::s3_on_event(FSMEvent* pEvt)
|
|
|
{
|
|
|
ret = pEvt->param1;
|
|
|
if (ret == 1) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("插卡时查询设备状态故障");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("插卡时查询设备状态故障");
|
|
|
setQuickSelfCheck();
|
|
|
}
|
|
|
else if (ret == 4) {
|
|
@@ -875,7 +875,7 @@ unsigned int CCardIssuerFSM::s6_on_event(FSMEvent* pEvt)
|
|
|
return 0;
|
|
|
}
|
|
|
else if (pEvt->param1 == 1) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("取卡时设备故障");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("取卡时设备故障");
|
|
|
setQuickSelfCheck();
|
|
|
return 1;
|
|
|
}
|
|
@@ -921,7 +921,7 @@ unsigned int CCardIssuerFSM::s7_on_event(FSMEvent* pEvt)
|
|
|
FetchCard evt;
|
|
|
evt.status = 2;
|
|
|
SpSendBroadcast(m_pEntity->GetFunction(), SP_MSG_OF(FetchCard), SP_MSG_SIG_OF(FetchCard), evt);
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("客户未取卡超时msg发送");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("客户未取卡超时msg发送");
|
|
|
m_captureReason = "4019";
|
|
|
LogWarn(Severity_Low, Error_NotInit, CardIssuer_UserErrorCode_Customer_Forget_Fectch_Card, "Customer forget fetch card.");
|
|
|
CaptureTask* task = new CaptureTask(this);
|
|
@@ -1113,13 +1113,13 @@ void CCardIssuerFSM::s9_on_entry()
|
|
|
m_currentFSMState = 9;
|
|
|
SetDevState(DEVICE_STATUS_FAULT);
|
|
|
if (m_quickSelfcheck) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuerStand in fault state, need to quickSelfcheck.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuerStand in fault state, need to quickSelfcheck.");
|
|
|
m_testResult = Error_InvalidState;
|
|
|
QuickSelfcheckTask* task = new QuickSelfcheckTask(this);
|
|
|
GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuerStand in fault state, need to reset.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuerStand in fault state, need to reset.");
|
|
|
FSMEvent* e = new FSMEvent(USER_EVT_RESET);
|
|
|
PostEventFIFO(e);
|
|
|
}
|
|
@@ -1395,7 +1395,7 @@ ErrorCodeEnum CCardIssuerFSM::OnInit()
|
|
|
m_pCardProcess = new CCardProcess();
|
|
|
if (m_pCardProcess == NULL)//almost no use...
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("create card process failed.");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CY")("create card process failed.");
|
|
|
return Error_Resource;
|
|
|
}
|
|
|
CSystemStaticInfo sysInfo;
|
|
@@ -1514,7 +1514,7 @@ int CCardIssuerFSM::Reset()
|
|
|
LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_CaptureCard_Reset, "issue flag is 1, to capture card.");
|
|
|
m_CardCaptured++;
|
|
|
if (!SetCardCaptured(m_CardCaptured))
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("set card captured failed.");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("set card captured failed.");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -1621,7 +1621,7 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
|
|
|
ErrorCodeEnum eErrPath = spEntityFunction->GetPath("Bin", csBinPath);
|
|
|
if (eErrPath != Error_Succeed)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("GetPath(bin) failed (%d) in OpenDevice.", eErrPath));
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("GetPath(bin) failed (%d) in OpenDevice.", eErrPath));
|
|
|
return Error_Param;
|
|
|
}
|
|
|
// [9/29/2019 14:13 @Gifur]
|
|
@@ -1692,10 +1692,11 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
|
|
|
break;
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("OpenDevice::DevOpenEx err, port:%d, baudRate:%d, openType:%d, connectType:%d", m_adapterInfo.GetPortInt(), m_adapterInfo.GetBaudrateInt(), btOpenType, m_connectType);
|
|
|
- SetErrorAndLog(eErrDev, MEC_DEVAPI_CARDISSUER_DevOpenEx, "DevAdapter::DevOpenEx", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ //DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("OpenDevice::DevOpenEx err, port:%d, baudRate:%d, openType:%d, connectType:%d", m_adapterInfo.GetPortInt(), m_adapterInfo.GetBaudrateInt(), btOpenType, m_connectType);
|
|
|
+ errMsg = CSimpleStringA::Format("OpenDevice::DevOpenEx err, port:%d, baudRate:%d, openType:%d, connectType:%d", m_adapterInfo.GetPortInt(), m_adapterInfo.GetBaudrateInt(), btOpenType, m_connectType);
|
|
|
+ SetErrorAndLog(eErrDev, MEC_DEVAPI_CARDISSUER_DevOpenEx, "DevAdapter::DevOpenEx", __FUNCTION__, false, l_endTime - l_beginTime, "", errMsg.GetData());
|
|
|
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuerStand启动失败:DevOpenEx failed.重试:%d", initTries);
|
|
|
+ //DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuerStand启动失败:DevOpenEx failed.重试:%d", initTries);
|
|
|
Sleep(200);
|
|
|
initTries++;
|
|
|
}
|
|
@@ -1711,7 +1712,7 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
|
|
|
{
|
|
|
eErrDev = spEntityFunction->OpenConfig(Config_Run, spConfig);
|
|
|
if (eErrDev != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("CardIssuerStand启动失败:open run cfg file failed in OpenDevice."));
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("CardIssuerStand启动失败:open run cfg file failed in OpenDevice."));
|
|
|
CloseAndClearDevObj(false);
|
|
|
return eErrDev;
|
|
|
}
|
|
@@ -1857,7 +1858,7 @@ int CCardIssuerFSM::Initial()
|
|
|
ErrorCodeEnum errCode = OpenDevice(DEV_OPEN_TYPE_COM,"");
|
|
|
if (errCode != Error_Succeed)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM)("OpenDevice in Initial return failed with errCode:%d(0x%x)", errCode, errCode);
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("OpenDevice in Initial return failed with errCode:%d(0x%x)", errCode, errCode);
|
|
|
CloseAndClearDevObj(false);
|
|
|
SetDevInitFlag(false);
|
|
|
}
|
|
@@ -2042,7 +2043,7 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req,
|
|
|
CSimpleStringA warnInfo = CSimpleStringA::Format("IssuerCard, hopper%d no more cards to issue. LocalRecord CardremainsEx:%d, Vendor return:NoCard(%d), CardCount(%d)",
|
|
|
m_currentHopper, m_remainsEx[m_currentHopper - 1], cis.eIssuerBin[m_currentHopper - 1], cis.dwIssuerCount[m_currentHopper - 1]);
|
|
|
//LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_No_More_Card_Issue, warnInfo.GetData());
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)(warnInfo.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)(warnInfo.GetData());
|
|
|
|
|
|
DWORD dwUsrErrCode = 0;
|
|
|
if (cis.eIssuerBin[m_currentHopper - 1] == CI_ISSUEHOPPER_NOTSUPP)
|
|
@@ -2173,10 +2174,10 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req,
|
|
|
}
|
|
|
m_bSettingMaterial = true;//oilyang 借用于延迟同步,紧接着设置remains时更新到后台数据库
|
|
|
if (!SetCardIssued(m_issuedEx[m_currentHopper - 1], m_currentHopper))
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("IssueCard, Set card issued failed.");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("IssueCard, Set card issued failed.");
|
|
|
m_bSettingMaterial = false;
|
|
|
if (!SetCardRemains(m_remainsEx[m_currentHopper - 1], m_currentHopper))
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("IssueCard, Set card remains failed.");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("IssueCard, Set card remains failed.");
|
|
|
m_bUseRFTillNext = false;
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220320")("IssueCard success.");
|
|
|
Sleep(1000);
|
|
@@ -2215,7 +2216,7 @@ int CCardIssuerFSM::CaptureCard(SpReqAnsContext<CardIssuerStandService_Capture_R
|
|
|
ret = 1;
|
|
|
m_CardCaptured++;
|
|
|
if (!SetCardCaptured(m_CardCaptured))
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<CaptureCard>, set card captured failed");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<CaptureCard>, set card captured failed");
|
|
|
m_pCardProcess->DataInit();
|
|
|
if (Error_Succeed == eErr){
|
|
|
l_beginTime = GetTickCountRVC();
|
|
@@ -2472,7 +2473,7 @@ int CCardIssuerFSM::AcceptCard(SpReqAnsContext<CardIssuerStandService_Insert_Req
|
|
|
else if(rc == 2)
|
|
|
{
|
|
|
if (ctx != NULL) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("AcceptCard, insert timeout");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("AcceptCard, insert timeout");
|
|
|
ctx->Answer(Error_TimeOut);
|
|
|
}
|
|
|
}
|
|
@@ -2517,7 +2518,7 @@ int CCardIssuerFSM::SplitTrack2(CSimpleStringA pTrack2,Track2Data &decodeData)
|
|
|
DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<SplitTrack2>, pTrack2.len:%d", dataLen);
|
|
|
|
|
|
if (pTrack2.GetLength() == 0) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SplitTrack2>, pTrack2.len=0");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E2")("<SplitTrack2>, pTrack2.len=0");
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
@@ -2545,10 +2546,10 @@ int CCardIssuerFSM::SplitTrack2(CSimpleStringA pTrack2,Track2Data &decodeData)
|
|
|
decodeData.t2Region = "";
|
|
|
break;
|
|
|
case 38:
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SplitTrack2>, pTrack2.len=38 Not implemented ");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<SplitTrack2>, pTrack2.len=38 Not implemented ");
|
|
|
break;
|
|
|
default:
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SplitTrack2>, pTrack2.len=%d Not implemented ", dataLen);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<SplitTrack2>, pTrack2.len=%d Not implemented ", dataLen);
|
|
|
return -1;
|
|
|
}
|
|
|
decodeData.status = 0;
|
|
@@ -3282,8 +3283,8 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
|
|
|
CSimpleStringA taaResult;
|
|
|
BYTE bt9f27 = 0;
|
|
|
int retTAA = m_pCardProcess->TermActionAnalyze(CARD_MACHINE_ISSUER,m_hDevHelper,taaResult,true,m_bCDA,bt9f27);
|
|
|
- if (retTAA != 0 || taaResult.GetLength() == 0) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnline>, TermActionAnalyze , retTAA:%d, taaResult:%s", retTAA, taaResult.GetData());
|
|
|
+ if (retTAA != 0) {
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<PreOnline>, TermActionAnalyze , retTAA:%d, taaResult:%s", retTAA, taaResult.GetData());
|
|
|
}
|
|
|
switch(retTAA)
|
|
|
{//to be added oiltmp 20140929
|
|
@@ -3323,7 +3324,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
|
|
|
ICData appExpiryDate(false,0x5f,0x24);
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_IC,appExpiryDate,false,0) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnline>, can't find expire date");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E1")("<PreOnline>, can't find expire date");
|
|
|
if (!IfUseRf())
|
|
|
ctx->Answer(Error_Succeed);
|
|
|
return 0;
|
|
@@ -3338,7 +3339,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
|
|
|
ZeroMemory(pICCardSerial,4);
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_IC,ICCardSerial,false) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnline>, can't find card serial.");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E1")("<PreOnline>, can't find card serial.");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -3346,7 +3347,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
|
|
|
}
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_IC,track2,false,0) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnline>, [ic]no track2 data");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E1")("<PreOnline>, [ic]no track2 data");
|
|
|
l_beginTime = GetTickCountRVC();
|
|
|
eErr = m_hDevHelper->ReleaseIC();
|
|
|
l_endTime = GetTickCountRVC();
|
|
@@ -3414,7 +3415,6 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
|
|
|
actionType = "ARQC";
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnline>, actionType is empty");
|
|
|
actionType = "";
|
|
|
}
|
|
|
//【55域】
|
|
@@ -3670,7 +3670,7 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
|
|
|
ICData appExpiryDate(false, 0x5f, 0x24);
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_IC, appExpiryDate, false, 0) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnline_RF>, can't find expire date");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E1")("<PreOnline_RF>, can't find expire date");
|
|
|
ctx->Answer(Error_Succeed);
|
|
|
return 0;
|
|
|
}
|
|
@@ -3684,7 +3684,7 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
|
|
|
ZeroMemory(pICCardSerial, 4);
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_IC, ICCardSerial, false) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnline_RF>, can't find card serial.");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E1")("<PreOnline_RF>, can't find card serial.");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -3692,7 +3692,7 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
|
|
|
}
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_IC, track2, false, 0) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnline_RF>, [ic]no track2 data");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E1")("<PreOnline_RF>, [ic]no track2 data");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -3746,7 +3746,6 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
|
|
|
actionType = "ARQC";
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnline_RF>, actionType is empty");
|
|
|
actionType = "";
|
|
|
}
|
|
|
//【55域】
|
|
@@ -3885,7 +3884,7 @@ int CCardIssuerFSM::WriteCard(SpReqAnsContext<CardIssuerStandService_WriteTrack_
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("WriteCard,t1Len:%d, t2Len:%d, t3Len:%d", ctx->Req.track1.GetLength(), ctx->Req.track2.GetLength(), ctx->Req.track3.GetLength());
|
|
|
if (ctx->Req.track1.GetLength() <= 0 && ctx->Req.track2.GetLength() <= 0 && ctx->Req.track3.GetLength() <= 0)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<WriteCard>, write card param is null.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<WriteCard>, write card param is null.");
|
|
|
ctx->Answer(Error_Param);
|
|
|
return ret;
|
|
|
}
|
|
@@ -3975,11 +3974,11 @@ bool CCardIssuerFSM::FSMSetIssueFlag(int value)
|
|
|
//oilyang@20171220 如果曾经卡片卡住,但启动时没有发现卡片,则更新本次发卡方向但不写文件,以防后续卡片被移动到卡槽
|
|
|
if (!m_hasCardWhileDevOpen)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("card jamed havn't been process.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("card jamed havn't been process.");
|
|
|
m_issueStatus = 0;
|
|
|
}
|
|
|
else
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("insert succeed,but there maybe some card jamed...");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("insert succeed,but there maybe some card jamed...");
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -3988,7 +3987,7 @@ bool CCardIssuerFSM::FSMSetIssueFlag(int value)
|
|
|
CSmartPointer<IConfigInfo> spConfig;
|
|
|
ErrorCodeEnum eErrDev = spEntityFunction->OpenConfig(Config_Run, spConfig);
|
|
|
if (eErrDev != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("(FSMSetIssueFlag)open cfg file failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("(FSMSetIssueFlag)open cfg file failed!");
|
|
|
return false;
|
|
|
}
|
|
|
|
|
@@ -4003,14 +4002,14 @@ bool CCardIssuerFSM::SetCardCaptured(const int num,bool bClear)
|
|
|
num, bClear, m_maxRetainCount, m_bSettingMaterial);
|
|
|
if (num < 0)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SetCardCaptured>, wrong reset card captured");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardCaptured>, wrong reset card captured");
|
|
|
return false;
|
|
|
}
|
|
|
CSmartPointer<IEntityFunction> spEntityFunction = GetEntityBase()->GetFunction();
|
|
|
CSmartPointer<IConfigInfo> spConfig;
|
|
|
ErrorCodeEnum eErrDev = spEntityFunction->OpenConfig(Config_Run, spConfig);
|
|
|
if (eErrDev != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SetCardCaptured>, open cfg file failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardCaptured>, open cfg file failed!");
|
|
|
return false;
|
|
|
}
|
|
|
m_CardCaptured = num;
|
|
@@ -4037,7 +4036,7 @@ bool CCardIssuerFSM::SetCardIssued(const int num, const int hopper)
|
|
|
CSmartPointer<IConfigInfo> spConfig;
|
|
|
ErrorCodeEnum eErrDev = spEntityFunction->OpenConfig(Config_Run, spConfig);
|
|
|
if (eErrDev != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SetCardIssued>, open cfg file failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardIssued>, open cfg file failed!");
|
|
|
return false;
|
|
|
}
|
|
|
char buf[8];
|
|
@@ -4066,7 +4065,7 @@ bool CCardIssuerFSM::SetCardIssued(const int num, const int hopper)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SetCardIssued>, write CardIssued err:%d", eErrDev);
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardIssued>, write CardIssued err:%d", eErrDev);
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
@@ -4105,7 +4104,7 @@ bool CCardIssuerFSM::SetCardRemains(const int num, const int hopper,bool bInit)
|
|
|
CSmartPointer<IConfigInfo> spConfig;
|
|
|
ErrorCodeEnum eErrDev = spEntityFunction->OpenConfig(Config_Run, spConfig);
|
|
|
if (eErrDev != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SetCardRemains>, open cfg file failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardRemains>, open cfg file failed!");
|
|
|
return false;
|
|
|
}
|
|
|
char buf[8];
|
|
@@ -4123,7 +4122,7 @@ bool CCardIssuerFSM::SetCardRemains(const int num, const int hopper,bool bInit)
|
|
|
|
|
|
if (eErrDev != Error_Succeed)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SetCardRemains>, write CardInit err:%d", eErrDev);
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardRemains>, write CardInit err:%d", eErrDev);
|
|
|
return false;
|
|
|
}
|
|
|
//oilyang@20170428 汪磊东要求单卡箱也要同步数据
|
|
@@ -4136,7 +4135,7 @@ bool CCardIssuerFSM::SetCardRemains(const int num, const int hopper,bool bInit)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SetCardRemains>, write CardRemains err:%d", eErrDev);
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardRemains>, write CardRemains err:%d", eErrDev);
|
|
|
return false;
|
|
|
}
|
|
|
return true;
|
|
@@ -4148,12 +4147,12 @@ bool CCardIssuerFSM::SetCardMixed(const int num, const int hopper)
|
|
|
CSmartPointer<IConfigInfo> spConfig;
|
|
|
ErrorCodeEnum eErrDev = spEntityFunction->OpenConfig(Config_Run, spConfig);
|
|
|
if (eErrDev != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SetCardMixed>, open cfg file failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardMixed>, open cfg file failed!");
|
|
|
return false;
|
|
|
}
|
|
|
if (hopper < 1 || hopper > HOPPER_NUM)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("wrong hopper num:%d .", hopper));
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")(CSimpleStringA::Format("wrong hopper num:%d .", hopper));
|
|
|
return false;
|
|
|
}
|
|
|
if (num == 0)
|
|
@@ -4178,7 +4177,7 @@ bool CCardIssuerFSM::SetCardMixed(const int num, const int hopper)
|
|
|
|
|
|
if (eErrDev != Error_Succeed)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SetCardMixed>, write CardMixed err:%d", eErrDev);
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardMixed>, write CardMixed err:%d", eErrDev);
|
|
|
return false;
|
|
|
}
|
|
|
//oilyang@20170428 汪磊东要求单卡箱也要同步数据
|
|
@@ -4269,7 +4268,7 @@ int CCardIssuerFSM::UpdateLocalRunCfg(CAutoArray<int> hopperArr)
|
|
|
CSmartPointer<IConfigInfo> spConfig;
|
|
|
ErrorCodeEnum eErrDev = spEntityFunction->OpenConfig(Config_Run, spConfig);
|
|
|
if (eErrDev != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("(UpdateLocalRunCfg)open cfg file failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("(UpdateLocalRunCfg)open cfg file failed!");
|
|
|
return false;
|
|
|
}
|
|
|
|
|
@@ -4613,7 +4612,7 @@ bool CCardIssuerFSM::RegistCardWhileCaptureCard(CSimpleStringA cardno)
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304")("解析返回报文qRegistCardRet失败");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304").setResultCode("RTA2341")("解析返回报文qRegistCardRet失败");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304").setResultCode("RTA2340")("访问吞卡登记失败");
|
|
@@ -4740,7 +4739,7 @@ bool CCardIssuerFSM::IsValidCardNo(const char *pCardNo,int len)
|
|
|
if (pCardNo[i] < 0x30 || pCardNo[i] > 0x39)
|
|
|
{
|
|
|
//not '0'-'9'
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<IsValidCardNo>, CardNo is Invalid with illegal charactor:%c", pCardNo[i]);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<IsValidCardNo>, CardNo is Invalid with illegal charactor:%c", pCardNo[i]);
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
@@ -5120,7 +5119,7 @@ bool CCardIssuerFSM::AccountExchange(const char *origAcc, CSimpleStringA &acc, i
|
|
|
if (len < 8)
|
|
|
{
|
|
|
if (len > 4)//排除掉一些空格或者换行之类的干扰日志
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<AccountExchange>, account size error:%d", len);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<AccountExchange>, account size error:%d", len);
|
|
|
return false;
|
|
|
}
|
|
|
CSimpleStringA csTmp(' ',len+1);
|
|
@@ -5223,12 +5222,12 @@ void CCardIssuerFSM::DecodeTracksData(const char *track2, DWORD dwT2size, const
|
|
|
|
|
|
if (!bT2OK)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<DecodeTracksData>, track2 data isn't ok.");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E3")("<DecodeTracksData>, track2 data isn't ok.");
|
|
|
return;
|
|
|
}
|
|
|
if (dwT2size <= 0 || strlen(track2) < 15)//fixpoint AE card is 15
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<DecodeTracksData>, track2 size maybe wrong.");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E3")("<DecodeTracksData>, track2 size maybe wrong.");
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -5246,7 +5245,7 @@ void CCardIssuerFSM::DecodeTracksData(const char *track2, DWORD dwT2size, const
|
|
|
|
|
|
if (!bT3OK || strlen(cardType) < 4)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<DecodeTracksData>, track3 data isn't ok or track3 size maybe wrong");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E3")("<DecodeTracksData>, track3 data isn't ok or track3 size maybe wrong");
|
|
|
cmdDecodeMag2(tmpMag2_3, magData);
|
|
|
}
|
|
|
}
|
|
@@ -5455,21 +5454,21 @@ int CCardIssuerFSM::EjectJS(SpReqAnsContext<CardIssuerStandService_EjectJS_Req,
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
DWORD dwTmpUserErrCode = 0;
|
|
|
if (eErr != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("EjectJS::MoveCard(CI_MOVECARD_FRONT_GATE) err");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("EjectJS::MoveCard(CI_MOVECARD_FRONT_GATE) err");
|
|
|
if (m_bCardFromHopper) {
|
|
|
if (IsInBusiness() && ctx != NULL) {
|
|
|
- dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, true, l_endTime - l_beginTime, "QLR040220342", "");
|
|
|
+ dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, true, l_endTime - l_beginTime, "QLR040220342", "EjectJS::MoveCard(CI_MOVECARD_FRONT_GATE) err");
|
|
|
}
|
|
|
else {
|
|
|
- dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220342", "");
|
|
|
+ dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220342", "EjectJS::MoveCard(CI_MOVECARD_FRONT_GATE) err");
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
if (IsInBusiness() && ctx != NULL) {
|
|
|
- dwTmpUserErrCode = SetErrorAndLog(eErr, CardIssuer_UserErrorCode_MoveCardToGate_Failed, "DevAdapter::MoveCard", __FUNCTION__, true, l_endTime - l_beginTime, "QLR040220342", "");
|
|
|
+ dwTmpUserErrCode = SetErrorAndLog(eErr, CardIssuer_UserErrorCode_MoveCardToGate_Failed, "DevAdapter::MoveCard", __FUNCTION__, true, l_endTime - l_beginTime, "QLR040220342", "EjectJS::MoveCard(CI_MOVECARD_FRONT_GATE) err");
|
|
|
}
|
|
|
else {
|
|
|
- dwTmpUserErrCode = SetErrorAndLog(eErr, CardIssuer_UserErrorCode_MoveCardToGate_Failed, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220342", "");
|
|
|
+ dwTmpUserErrCode = SetErrorAndLog(eErr, CardIssuer_UserErrorCode_MoveCardToGate_Failed, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220342", "EjectJS::MoveCard(CI_MOVECARD_FRONT_GATE) err");
|
|
|
}
|
|
|
}
|
|
|
if (ctx != NULL) {
|
|
@@ -5505,8 +5504,8 @@ int CCardIssuerFSM::EjectJS(SpReqAnsContext<CardIssuerStandService_EjectJS_Req,
|
|
|
|
|
|
|
|
|
if (eErr != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("EjectJS::SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN) err");
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220342", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("EjectJS::SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN) err");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220342", "EjectJS::SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN) err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("EjectJS::SetCardInType");
|
|
@@ -5538,7 +5537,7 @@ int CCardIssuerFSM::EjectJS(SpReqAnsContext<CardIssuerStandService_EjectJS_Req,
|
|
|
}
|
|
|
} while ((dwEnd - dwStart) < 55 * 1000);//预留5秒给吞卡操作
|
|
|
LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_GREEN_OFF, "CardReader(fetch) warning off");
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("客户未取卡超时");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("客户未取卡超时");
|
|
|
|
|
|
//超时未取卡进行吞卡操作
|
|
|
l_beginTime = GetTickCountRVC();
|
|
@@ -5557,8 +5556,8 @@ int CCardIssuerFSM::EjectJS(SpReqAnsContext<CardIssuerStandService_EjectJS_Req,
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
|
|
|
if (eErrSet != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("EjectJS::SetCardInType err");
|
|
|
- SetErrorAndLog(eErrSet, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220342", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("EjectJS::SetCardInType err");
|
|
|
+ SetErrorAndLog(eErrSet, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220342", "EjectJS::SetCardInType err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("EjectJS::SetCardInType");
|
|
@@ -5571,10 +5570,10 @@ int CCardIssuerFSM::EjectJS(SpReqAnsContext<CardIssuerStandService_EjectJS_Req,
|
|
|
return 0;//超时吞卡成功
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("EjectJS::MoveCard(CI_MOVECARD_BACK_NOT_HOLD) err");
|
|
|
- if (ctx != NULL) {
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220342", "");
|
|
|
- }
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("EjectJS::MoveCard(CI_MOVECARD_BACK_NOT_HOLD) err");
|
|
|
+
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220342", "EjectJS::MoveCard(CI_MOVECARD_BACK_NOT_HOLD) err");
|
|
|
+
|
|
|
//超时吞卡失败
|
|
|
LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_Forget_Fetch_Card_Capture_Fail, "forget fetch card ,capture fail");
|
|
|
if (ctx != NULL) {
|
|
@@ -5618,8 +5617,8 @@ int CCardIssuerFSM::CaptureJS(SpReqAnsContext<CardIssuerStandService_CaptureJS_R
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
|
|
|
if (eErrSet != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CaptureJS::SetCardInType err");
|
|
|
- SetErrorAndLog(eErrSet, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220343", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CaptureJS::SetCardInType err");
|
|
|
+ SetErrorAndLog(eErrSet, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220343", "CaptureJS::SetCardInType err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("CaptureJS::SetCardInType");
|
|
@@ -5627,7 +5626,7 @@ int CCardIssuerFSM::CaptureJS(SpReqAnsContext<CardIssuerStandService_CaptureJS_R
|
|
|
CSimpleStringA maskCardno = MaskCardno(m_currCardNo.GetData());
|
|
|
m_currCardNo = m_addCardNo = "";
|
|
|
if (ctx != NULL) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CaptureJS::GetDevStatus succ, No card found in cardReader, m_currCardNo=%s", maskCardno.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CaptureJS::GetDevStatus succ, No card found in cardReader, m_currCardNo=%s", maskCardno.GetData());
|
|
|
LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_Capture_NoCard_Failed, "Capture card, No card found in cardReader");
|
|
|
ctx->Answer(Error_Unexpect, CardIssuer_UserErrorCode_Capture_NoCard_Failed);//读卡器无卡
|
|
|
}
|
|
@@ -5657,17 +5656,17 @@ int CCardIssuerFSM::CaptureJS(SpReqAnsContext<CardIssuerStandService_CaptureJS_R
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
|
|
|
if (eErrSet != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CaptureJS::SetCardInType err");
|
|
|
- SetErrorAndLog(eErrSet, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220343", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CaptureJS::SetCardInType err");
|
|
|
+ SetErrorAndLog(eErrSet, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220343", "CaptureJS::SetCardInType err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("CaptureJS::SetCardInType");
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CaptureJS::MoveCard(CI_MOVECARD_BACK_NOT_HOLD) err");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CaptureJS::MoveCard(CI_MOVECARD_BACK_NOT_HOLD) err");
|
|
|
if (ctx != NULL && IsInBusiness()) {
|
|
|
- dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, true, l_endTime - l_beginTime, "QLR040220343", "");
|
|
|
+ dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, true, l_endTime - l_beginTime, "QLR040220343", "CaptureJS::MoveCard(CI_MOVECARD_BACK_NOT_HOLD) err");
|
|
|
}
|
|
|
else {
|
|
|
dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220343", "");
|
|
@@ -5974,8 +5973,8 @@ int CCardIssuerFSM::ReadMag(SpReqAnsContext<CardIssuerStandService_ReadJS_Req, C
|
|
|
ctx->Ans.track3Status = (int)magTracks.track[2].eStatus;
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("ReadMag::MagRead fail");
|
|
|
- SetErrorAndLog(eMagReadErr, MEC_DEVAPI_CARDISSUER_MagRead, "DevAdapter::MagRead", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ReadMag::MagRead fail");
|
|
|
+ SetErrorAndLog(eMagReadErr, MEC_DEVAPI_CARDISSUER_MagRead, "DevAdapter::MagRead", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadMag::MagRead fail");
|
|
|
bReadMag = false;//读卡失败
|
|
|
ctx->Ans.magStatus = 0;//失败
|
|
|
ctx->Ans.track1 = "";
|
|
@@ -6173,8 +6172,8 @@ int CCardIssuerFSM::CheckCardType(CSimpleStringA cardNo, bool bReadMag, int& ICt
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
|
|
|
if (eErr != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CheckCardType::DeactivateICCard err");
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard, "DevAdapter::DeactivateICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CheckCardType::DeactivateICCard err");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard, "DevAdapter::DeactivateICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "CheckCardType::DeactivateICCard err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DeactivateICCard").setCostTime(l_endTime - l_beginTime)("CheckCardType::DeactivateICCard");
|
|
@@ -6185,8 +6184,8 @@ int CCardIssuerFSM::CheckCardType(CSimpleStringA cardNo, bool bReadMag, int& ICt
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
|
|
|
if (eErr != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CheckCardType::ReleaseIC err");
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReleaseIC, "DevAdapter::ReleaseIC", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CheckCardType::ReleaseIC err");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReleaseIC, "DevAdapter::ReleaseIC", __FUNCTION__, false, l_endTime - l_beginTime, "", "CheckCardType::ReleaseIC err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::ReleaseIC").setCostTime(l_endTime - l_beginTime)("CheckCardType::ReleaseIC");
|
|
@@ -6215,8 +6214,8 @@ int CCardIssuerFSM::CheckCardType(CSimpleStringA cardNo, bool bReadMag, int& ICt
|
|
|
|
|
|
if (eErr != Error_Succeed)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CheckCardType::MoveCard err");
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CheckCardType::MoveCard err");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "CheckCardType::MoveCard err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime)("CheckCardType::MoveCard, (CI_MOVECARD_RF_POSITION)");
|
|
@@ -6254,8 +6253,8 @@ int CCardIssuerFSM::CheckCardType(CSimpleStringA cardNo, bool bReadMag, int& ICt
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
|
|
|
if (eErr != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CheckCardType::DeactContactlessICCard err");
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactContactlessICCard, "DevAdapter::DeactContactlessICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CheckCardType::DeactContactlessICCard err");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactContactlessICCard, "DevAdapter::DeactContactlessICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "CheckCardType::DeactContactlessICCard err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DeactContactlessICCard").setCostTime(l_endTime - l_beginTime)("ReadCard_RF::DeactContactlessICCard");
|
|
@@ -6441,8 +6440,8 @@ int CCardIssuerFSM::PreOnlineJS_Contact(SpReqAnsContext<CardIssuerStandService_R
|
|
|
CSimpleStringA taaResult;
|
|
|
BYTE bt9f27 = 0;
|
|
|
int retTAA = m_pCardProcess->TermActionAnalyze(CARD_MACHINE_ISSUER, m_hDevHelper, taaResult, true, m_bCDA, bt9f27);
|
|
|
- if (retTAA != 0 || taaResult.GetLength() == 0) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnlineJS_Contact>, TermActionAnalyze, retTAA:%d, taaResult:%s", retTAA, taaResult.GetData());
|
|
|
+ if (retTAA != 0) {
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<PreOnlineJS_Contact>, TermActionAnalyze, retTAA:%d, taaResult:%s", retTAA, taaResult.GetData());
|
|
|
}
|
|
|
switch (retTAA)
|
|
|
{//to be added oiltmp 20140929
|
|
@@ -6463,7 +6462,7 @@ int CCardIssuerFSM::PreOnlineJS_Contact(SpReqAnsContext<CardIssuerStandService_R
|
|
|
bContinue = true; //继续后面的非接流程
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnlineJS_Contact>,TermActionAnalyze result len = 0");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<PreOnlineJS_Contact>,TermActionAnalyze result len = 0");
|
|
|
ctx->Ans.icState = 0;
|
|
|
ctx->Answer(Error_Succeed);
|
|
|
}
|
|
@@ -6491,7 +6490,7 @@ int CCardIssuerFSM::PreOnlineJS_Contact(SpReqAnsContext<CardIssuerStandService_R
|
|
|
ZeroMemory(pExpireDate, 12);
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_IC, appExpiryDate, false, 0) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnlineJS_Contact>, can't find expire date");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E1")("<PreOnlineJS_Contact>, can't find expire date");
|
|
|
if (IfUseRf()) {
|
|
|
bContinue = true; //继续后面的非接流程
|
|
|
delete[] pExpireDate;
|
|
@@ -6509,7 +6508,7 @@ int CCardIssuerFSM::PreOnlineJS_Contact(SpReqAnsContext<CardIssuerStandService_R
|
|
|
ZeroMemory(pICCardSerial, 4);
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_IC, ICCardSerial, false) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnlineJS_Contact>, can't find card serial.");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E1")("<PreOnlineJS_Contact>, can't find card serial.");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -6523,7 +6522,7 @@ int CCardIssuerFSM::PreOnlineJS_Contact(SpReqAnsContext<CardIssuerStandService_R
|
|
|
ZeroMemory(pICTrack2, 128);
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_IC, track2, false, 0) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnlineCrossJS_Contact>, ic no track2 data");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E1")("<PreOnlineCrossJS_Contact>, ic no track2 data");
|
|
|
l_beginTime = GetTickCountRVC();
|
|
|
eErr = m_hDevHelper->ReleaseIC();
|
|
|
l_endTime = GetTickCountRVC();
|
|
@@ -6574,7 +6573,6 @@ int CCardIssuerFSM::PreOnlineJS_Contact(SpReqAnsContext<CardIssuerStandService_R
|
|
|
actionType = "ARQC";
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnlineJS_Contact>, actionType is empty");
|
|
|
actionType = "";
|
|
|
}
|
|
|
//【55域】
|
|
@@ -6816,7 +6814,7 @@ int CCardIssuerFSM::PreOnlineJS_RF(SpReqAnsContext<CardIssuerStandService_ReadJS
|
|
|
CSimpleStringA taaResult;
|
|
|
BYTE bt9f27 = 0;
|
|
|
int retTAA = m_pCardProcess->TermActionAnalyze(CARD_MACHINE_ISSUER_RF, m_hDevHelper, taaResult, true, m_bCDA, bt9f27);
|
|
|
- if (retTAA != 0 || taaResult.GetLength() == 0) {
|
|
|
+ if (retTAA != 0) {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<PreOnlineJS_RF>, TermActionAnalyze, retTAA:%d, taaResult:%s", retTAA, taaResult.GetData());
|
|
|
}
|
|
|
switch (retTAA)
|
|
@@ -6834,7 +6832,7 @@ int CCardIssuerFSM::PreOnlineJS_RF(SpReqAnsContext<CardIssuerStandService_ReadJS
|
|
|
|
|
|
if (ctx->Ans.result.GetLength() == 0)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnlineJS_RF>,TermActionAnalyze result len = 0");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<PreOnlineJS_RF>,TermActionAnalyze result len = 0");
|
|
|
ctx->Ans.icState = 0;
|
|
|
ctx->Answer(Error_Succeed);
|
|
|
return 0;
|
|
@@ -6860,7 +6858,7 @@ int CCardIssuerFSM::PreOnlineJS_RF(SpReqAnsContext<CardIssuerStandService_ReadJS
|
|
|
ZeroMemory(pExpireDate, 12);
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_IC, appExpiryDate, false, 0) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnlineJS_RF>, can't find expire date");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E1")("<PreOnlineJS_RF>, can't find expire date");
|
|
|
}
|
|
|
else {
|
|
|
HexBuf2StrBuf(appExpiryDate.value, &pExpireDate, appExpiryDate.lenth);
|
|
@@ -6873,7 +6871,7 @@ int CCardIssuerFSM::PreOnlineJS_RF(SpReqAnsContext<CardIssuerStandService_ReadJS
|
|
|
ZeroMemory(pICCardSerial, 4);
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_IC, ICCardSerial, false) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnlineJS_RF>, can't find card serial.");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E1")("<PreOnlineJS_RF>, can't find card serial.");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -6888,7 +6886,7 @@ int CCardIssuerFSM::PreOnlineJS_RF(SpReqAnsContext<CardIssuerStandService_ReadJS
|
|
|
ZeroMemory(pICTrack2, 128);
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_IC, track2, false, 0) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnlineJS_RF>, ic no track2 data");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23E1")("<PreOnlineJS_RF>, ic no track2 data");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -6930,7 +6928,6 @@ int CCardIssuerFSM::PreOnlineJS_RF(SpReqAnsContext<CardIssuerStandService_ReadJS
|
|
|
actionType = "ARQC";
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<PreOnlineJS_RF>, actionType is empty");
|
|
|
actionType = "";
|
|
|
}
|
|
|
//【55域】
|
|
@@ -7041,15 +7038,15 @@ int CCardIssuerFSM::ReadJS(SpReqAnsContext<CardIssuerStandService_ReadJS_Req, Ca
|
|
|
{
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevStatus").setCostTime(l_endTime - l_beginTime)("ReadJS::GetDevStatus, m_devStatus.eMedia:%d", m_devStatus.eMedia);
|
|
|
if (m_devStatus.eMedia != CI_MEDIA_PRESENT) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("ReadJS read fail , has no card.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ReadJS read fail , has no card.");
|
|
|
ctx->Answer(Error_Unexpect, CardIssuer_UserErrorCode_Read_NoCard_Failed);//无卡
|
|
|
return 1;//跳转到无卡状态?
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("ReadJS::GetDevStatus err");
|
|
|
- DWORD dwTmpUserErrCode = SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ReadJS::GetDevStatus err");
|
|
|
+ DWORD dwTmpUserErrCode = SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadJS::GetDevStatus err");
|
|
|
ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
|
|
|
return 0;
|
|
|
}
|
|
@@ -7130,7 +7127,7 @@ int CCardIssuerFSM::InsertJS(SpReqAnsContext<CardIssuerStandService_InsertJS_Req
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
if (Error_Succeed == eErr) {
|
|
|
if (m_devStatus.eMedia == CI_MEDIA_PRESENT) {
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("InsertJS::InternalInsert,internal has card before insert");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("InsertJS::InternalInsert,internal has card before insert");
|
|
|
ctx->Answer(Error_Unexpect, CardIssuer_UserErrorCode_Insert_Card_HasCard_Failed);
|
|
|
return 5;
|
|
|
}
|
|
@@ -7153,7 +7150,7 @@ int CCardIssuerFSM::InsertJS(SpReqAnsContext<CardIssuerStandService_InsertJS_Req
|
|
|
}
|
|
|
else if (rc == 2)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("InsertJS, insert timeout");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("InsertJS, insert timeout");
|
|
|
ctx->Answer(Error_TimeOut,CardIssuer_UserErrorCode_Insert_Card_TimeOut);
|
|
|
}
|
|
|
else if (rc == 3 || rc == 4)
|