|
@@ -254,7 +254,7 @@ unsigned int CCardIssuerFSM::s2_on_event(FSMEvent* pEvt)
|
|
|
pGMEE->ctx->Ans.reserved1[i] = 0;
|
|
|
pGMEE->ctx->Ans.reserved2[i] = "";
|
|
|
}
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("GetMaterial CardBoxNo (%d):%s, PsbCode:%s, PsbName:%s, CardInit:%d, remains:%d, issued:%d, mixed:%d,",i,
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("GetMaterial CardBoxNo (%d):%s, PsbCode:%s, PsbName:%s, CardInit:%d, remains:%d, issued:%d, mixed:%d,",i,
|
|
|
pGMEE->ctx->Ans.CardBoxNo[i].GetData(),
|
|
|
pGMEE->ctx->Ans.PsbCode[i].GetData(),
|
|
|
pGMEE->ctx->Ans.PsbName[i].GetData(),
|
|
@@ -264,7 +264,7 @@ unsigned int CCardIssuerFSM::s2_on_event(FSMEvent* pEvt)
|
|
|
pGMEE->ctx->Ans.mixed[i]);
|
|
|
}
|
|
|
pGMEE->ctx->Ans.reserved2[0] = m_devCat.szVendor;
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("captured:%d, szVendor:%s", m_CardCaptured, m_devCat.szVendor);
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("captured:%d, szVendor:%s", m_CardCaptured, m_devCat.szVendor);
|
|
|
pGMEE->ctx->Answer(Error_Succeed);
|
|
|
}
|
|
|
break;
|
|
@@ -670,7 +670,7 @@ unsigned int CCardIssuerFSM::s4_on_event(FSMEvent* pEvt)
|
|
|
pGMEE->ctx->Ans.reserved1[i] = 0;
|
|
|
pGMEE->ctx->Ans.reserved2[i] = "";
|
|
|
}
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("GetMaterial, CardBoxNo:%s, PsbCode:%s, PsbName:%s, CardInit:%d, remains:%d, issued:%d, mixed:%d,",
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("GetMaterial, CardBoxNo:%s, PsbCode:%s, PsbName:%s, CardInit:%d, remains:%d, issued:%d, mixed:%d,",
|
|
|
pGMEE->ctx->Ans.CardBoxNo[i].GetData(),
|
|
|
pGMEE->ctx->Ans.PsbCode[i].GetData(),
|
|
|
pGMEE->ctx->Ans.PsbName[i].GetData(),
|
|
@@ -818,8 +818,8 @@ unsigned int CCardIssuerFSM::s5_on_event(FSMEvent* pEvt)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("Read finished,获取设备状态GetDevStatus失败");
|
|
|
- SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, IsInBusiness(), 10, "QLR040220303", "");
|
|
|
+ //DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("Read finished,获取设备状态GetDevStatus失败");
|
|
|
+ SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, IsInBusiness(), 10, "QLR040220303", "Read finished,获取设备状态GetDevStatus失败");
|
|
|
pCRNFE->ctx->Answer(Error_Unexpect, GetAlarmDEC());
|
|
|
|
|
|
ret = 1;
|
|
@@ -986,7 +986,7 @@ unsigned int CCardIssuerFSM::s7_on_event(FSMEvent* pEvt)
|
|
|
pGMEE->ctx->Ans.reserved1[i] = 0;
|
|
|
pGMEE->ctx->Ans.reserved2[i] = "";
|
|
|
}
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("GetMaterial, CardBoxNo:%s, PsbCode:%s, PsbName:%s, CardInit:%d, remains:%d, issued:%d, mixed:%d,",
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("GetMaterial, CardBoxNo:%s, PsbCode:%s, PsbName:%s, CardInit:%d, remains:%d, issued:%d, mixed:%d,",
|
|
|
pGMEE->ctx->Ans.CardBoxNo[i].GetData(),
|
|
|
pGMEE->ctx->Ans.PsbCode[i].GetData(),
|
|
|
pGMEE->ctx->Ans.PsbName[i].GetData(),
|
|
@@ -996,7 +996,7 @@ unsigned int CCardIssuerFSM::s7_on_event(FSMEvent* pEvt)
|
|
|
pGMEE->ctx->Ans.mixed[i]);
|
|
|
}
|
|
|
pGMEE->ctx->Ans.reserved2[0] = m_devCat.szVendor;
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("captured:%d, szVendor:%s", m_CardCaptured, m_devCat.szVendor);
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("captured:%d, szVendor:%s", m_CardCaptured, m_devCat.szVendor);
|
|
|
pGMEE->ctx->Answer(Error_Succeed);
|
|
|
}
|
|
|
break;
|
|
@@ -1472,7 +1472,7 @@ bool CCardIssuerFSM::GetDevStatus(bool bPrint)
|
|
|
}
|
|
|
if (_strnicmp("RVC.CardPrinter", m_csMachineType, strlen("RVC.CardPrinter")) == 0)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("kaku tape(flat%d,concave:%d,gold:%d,silver:%d",
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("kaku tape(flat%d,concave:%d,gold:%d,silver:%d",
|
|
|
m_devStatus.eKakuTape[0], m_devStatus.eKakuTape[1], m_devStatus.eKakuTape[2], m_devStatus.eKakuTape[3]);
|
|
|
}
|
|
|
return true;
|
|
@@ -1508,7 +1508,7 @@ int CCardIssuerFSM::Reset()
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::Reset").setCostTime(l_endTime - l_beginTime)("Reset::Reset");
|
|
|
if(GetDevStatus())
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("m_issueStatus: %d, m_CardCaptured:%d, m_devStatus.eMedia:%d, in Reset.",
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("m_issueStatus: %d, m_CardCaptured:%d, m_devStatus.eMedia:%d, in Reset.",
|
|
|
m_issueStatus, m_CardCaptured, m_devStatus.eMedia);
|
|
|
if (m_devStatus.eMedia == CI_MEDIA_PRESENT || m_devStatus.eMedia == CI_MEDIA_ENTERING)
|
|
|
{
|
|
@@ -1538,7 +1538,7 @@ int CCardIssuerFSM::Reset()
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("media position %d",m_devStatus.eMedia);
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("media position %d",m_devStatus.eMedia);
|
|
|
return 1;
|
|
|
}
|
|
|
}
|
|
@@ -1748,7 +1748,7 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
|
|
|
for (int i = 0; i < m_hopperNum; ++i)
|
|
|
m_bHasHopper[i] = true;
|
|
|
}
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("has %d hopper.", m_hopperNum));
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("has %d hopper.", m_hopperNum));
|
|
|
char sec[2];
|
|
|
for (int i = 0; i < m_hopperNum; ++i)
|
|
|
{
|
|
@@ -1938,7 +1938,7 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req,
|
|
|
//99:移卡读卡
|
|
|
//98:手工取卡
|
|
|
//100:清空卡库、卡库盘库吞到吞卡箱
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("IssueCard, issue type:%d", ctxEx->Req.hopper));
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("IssueCard, issue type:%d", ctxEx->Req.hopper));
|
|
|
ctxEx->Ans.reserved1.Init(2);
|
|
|
|
|
|
//oiltmp 卡库独有吗?
|
|
@@ -2049,7 +2049,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_INFO, LOG_TYPE_USER)(warnInfo.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)(warnInfo.GetData());
|
|
|
|
|
|
DWORD dwUsrErrCode = 0;
|
|
|
if (cis.eIssuerBin[m_currentHopper - 1] == CI_ISSUEHOPPER_NOTSUPP)
|
|
@@ -2150,17 +2150,19 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req,
|
|
|
m_bCardFromHopper = true;
|
|
|
if (errCode != Error_Succeed)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("IssueCard::MoveCard err , m_currentHopper:%d", m_currentHopper);
|
|
|
+
|
|
|
+ CSimpleStringA ErrMsg = CSimpleStringA::Format("IssueCard::MoveCard err , m_currentHopper:%d", m_currentHopper);
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(ErrMsg.GetData());
|
|
|
FSMSetIssueFlag(2);
|
|
|
|
|
|
if (ctx != NULL) {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("从卡箱移动卡片到读卡器失败,请重试或检查是否有塞卡");
|
|
|
- SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", "");
|
|
|
+ //DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("从卡箱移动卡片到读卡器失败,请重试或检查是否有塞卡");
|
|
|
+ SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", ErrMsg.GetData());
|
|
|
ctx->Answer(Error_Unexpect, GetAlarmDEC());
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("从卡箱移动卡片到读卡器失败,请重试或检查是否有塞卡");
|
|
|
- SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", "");
|
|
|
+ //DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("从卡箱移动卡片到读卡器失败,请重试或检查是否有塞卡");
|
|
|
+ SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", ErrMsg.GetData());
|
|
|
ctxEx->Answer(Error_Unexpect, GetAlarmDEC());
|
|
|
}
|
|
|
return 1;
|
|
@@ -2168,7 +2170,7 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req,
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220320")("IssueCard::MoveCard succ, m_currentHopper:%d", m_currentHopper);
|
|
|
}
|
|
|
- LogWarn(Severity_Low, Error_Succeed, CardIssuer_UserErrorCode_MoveCard_FromHopper, "MoveCard from hopper suc.");
|
|
|
+ //LogWarn(Severity_Low, Error_Succeed, CardIssuer_UserErrorCode_MoveCard_FromHopper, "MoveCard from hopper suc.");
|
|
|
m_issuedEx[m_currentHopper - 1]++;
|
|
|
m_remainsEx[m_currentHopper - 1]--;
|
|
|
//oilyang@20180809 增加对单卡槽多卡槽机器的使用及闲置的适配
|
|
@@ -2253,7 +2255,7 @@ int CCardIssuerFSM::CaptureCard(SpReqAnsContext<CardIssuerStandService_Capture_R
|
|
|
}
|
|
|
}
|
|
|
if (ret == 0) {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setLogCode("QLR040220304")("Captured succ");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setLogCode("QLR040220304")("Captured succ");
|
|
|
}
|
|
|
return ret;
|
|
|
}
|
|
@@ -2279,7 +2281,7 @@ int CCardIssuerFSM::EjectCard(SpReqAnsContext<CardIssuerStandService_Eject_Req,C
|
|
|
ret = 1;
|
|
|
}
|
|
|
if (ret == 0) {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setLogCode("QLR040220305")("EjectCard succ");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setLogCode("QLR040220305")("EjectCard succ");
|
|
|
}
|
|
|
return ret;
|
|
|
}
|
|
@@ -2381,8 +2383,8 @@ int CCardIssuerFSM::InternalAcceptCard()
|
|
|
|
|
|
}
|
|
|
if (Error_Succeed != eErr) {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("InternalAcceptCard::SetCardInType CI_CARD_IN_TYPE_ALL err");
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("InternalAcceptCard::SetCardInType CI_CARD_IN_TYPE_ALL err");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "InternalAcceptCard::SetCardInType CI_CARD_IN_TYPE_ALL err");
|
|
|
|
|
|
}
|
|
|
else {
|
|
@@ -2408,8 +2410,8 @@ Err:
|
|
|
|
|
|
if (Error_Succeed != eErr)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("InternalAcceptCard::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN err");
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("InternalAcceptCard::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN err");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "InternalAcceptCard::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("InternalAcceptCard::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN");
|
|
@@ -2434,8 +2436,8 @@ Err:
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
|
|
|
if (eErr != Error_Succeed) {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("InternalAcceptCard::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN err");
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("InternalAcceptCard::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN err");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "InternalAcceptCard::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN err");
|
|
|
|
|
|
}
|
|
|
else {
|
|
@@ -2470,8 +2472,8 @@ int CCardIssuerFSM::AcceptCard(SpReqAnsContext<CardIssuerStandService_Insert_Req
|
|
|
m_bCardFromHopper = false;
|
|
|
if (ctx != NULL)
|
|
|
{
|
|
|
- LogWarn(Severity_Low, Error_Succeed, CardIssuer_UserErrorCode_InsertCardSucceed, "AcceptCard, insert succeed");
|
|
|
-
|
|
|
+ //LogWarn(Severity_Low, Error_Succeed, CardIssuer_UserErrorCode_InsertCardSucceed, "AcceptCard, insert succeed");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("AcceptCard, insert succeed");
|
|
|
m_bUseRFTillNext = false;
|
|
|
ctx->Answer(Error_Succeed);
|
|
|
}
|
|
@@ -2592,7 +2594,8 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
|
|
|
CSimpleString errMsg("");
|
|
|
errMsg = CSimpleString::Format("ReadCard, inParam: reserved1 for lightPos:%d, m_issueStatus:%d, m_currentHopper:%d",
|
|
|
ctx->Req.reserved1, m_issueStatus, m_currentHopper);
|
|
|
- LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_ReadCard_Process, errMsg.GetData());
|
|
|
+ //LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_ReadCard_Process, errMsg.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(errMsg.GetData());
|
|
|
DWORD dwStart = GetTickCountRVC();
|
|
|
MagTracks magTracks;
|
|
|
int readTries = 0;
|
|
@@ -2609,7 +2612,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
|
|
|
magTracks.track[1].eStatus, magTracks.track[2].eStatus, magTracks.track[1].dwSize, magTracks.track[2].dwSize);
|
|
|
}
|
|
|
else {
|
|
|
- SetErrorAndLog(eMagReadErr, MEC_DEVAPI_CARDISSUER_MagRead, "DevAdapter::MagRead", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ SetErrorAndLog(eMagReadErr, MEC_DEVAPI_CARDISSUER_MagRead, "DevAdapter::MagRead", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_Contact::MagRead err");
|
|
|
|
|
|
}
|
|
|
|
|
@@ -2811,7 +2814,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
|
|
|
if (eErr != Error_Succeed) {
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard, "DevAdapter::DeactivateICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard, "DevAdapter::DeactivateICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_Contact::DeactivateICCard err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DeactivateICCard").setCostTime(l_endTime - l_beginTime)("ReadCard_Contact::DeactivateICCard");
|
|
@@ -2822,7 +2825,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
|
|
|
if (eErr != Error_Succeed) {
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReleaseIC, "DevAdapter::ReleaseIC", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReleaseIC, "DevAdapter::ReleaseIC", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_Contact::ReleaseIC err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::ReleaseIC").setCostTime(l_endTime - l_beginTime)("ReadCard_Contact::ReleaseIC");
|
|
@@ -2831,7 +2834,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
|
|
|
}
|
|
|
}
|
|
|
CSimpleStringA cardType = CSimpleStringA::Format("cardType:%d", ctx->Ans.ICType);
|
|
|
- LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_CardType, cardType.GetData());
|
|
|
+ //LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_CardType, cardType.GetData());
|
|
|
|
|
|
DWORD dwEnd = GetTickCountRVC();
|
|
|
DWORD dwCollapse = dwEnd - dwStart;
|
|
@@ -2846,7 +2849,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
|
|
|
return 1;
|
|
|
}
|
|
|
bICOK = true;
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220303")("ReadCard suc.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220303")("ReadCard suc. cardType:%d", ctx->Ans.ICType);
|
|
|
return 0;
|
|
|
}
|
|
|
int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStandService_Read_Req, CardIssuerStandService_Read_Ans>::Pointer ctx)
|
|
@@ -2861,7 +2864,7 @@ int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStandService_Read_Req,
|
|
|
|
|
|
if (eErr != Error_Succeed)
|
|
|
{
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_RF::MoveCard err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime)("ReadCard_RF::MoveCard");
|
|
@@ -2874,7 +2877,8 @@ int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStandService_Read_Req,
|
|
|
CSimpleString errMsg("");
|
|
|
errMsg = CSimpleString::Format("ReadCard, inParam: reserved1 for lightPos:%d, m_issueStatus:%d, m_currentHopper:%d",
|
|
|
ctx->Req.reserved1, m_issueStatus, m_currentHopper);
|
|
|
- LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_ReadCard_Process, errMsg.GetData());
|
|
|
+ //LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_ReadCard_Process, errMsg.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(errMsg.GetData());
|
|
|
DWORD dwStart = GetTickCountRVC();
|
|
|
MagTracks magTracks;
|
|
|
int readTries = 0;
|
|
@@ -3070,7 +3074,7 @@ int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStandService_Read_Req,
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
|
|
|
if (eErr != Error_Succeed) {
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard, "DevAdapter::DeactContactlessICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard, "DevAdapter::DeactContactlessICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_RF::DeactContactlessICCard err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DeactContactlessICCard").setCostTime(l_endTime - l_beginTime)("ReadCard_RF::DeactContactlessICCard");
|
|
@@ -3079,7 +3083,7 @@ int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStandService_Read_Req,
|
|
|
}
|
|
|
}
|
|
|
CSimpleStringA cardType = CSimpleStringA::Format("cardType:%d", ctx->Ans.ICType);
|
|
|
- LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_CardType, cardType.GetData());
|
|
|
+ //LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_CardType, cardType.GetData());
|
|
|
|
|
|
DWORD dwEnd = GetTickCountRVC();
|
|
|
DWORD dwCollapse = dwEnd - dwStart;
|
|
@@ -3092,7 +3096,7 @@ int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStandService_Read_Req,
|
|
|
else
|
|
|
return 1;
|
|
|
}
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220303")("ReadCard suc.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220303")("ReadCard suc. cardType:%d", ctx->Ans.ICType);
|
|
|
return 0;
|
|
|
}
|
|
|
int CCardIssuerFSM::PreOnline(SpReqAnsContext<CardIssuerStandService_PreOnline_Req, CardIssuerStandService_PreOnline_Ans>::Pointer ctx)
|
|
@@ -3192,7 +3196,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
|
|
|
CSimpleStringA csErrMsgWithReturnCode = strResult.second.c_str();
|
|
|
|
|
|
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("检测卡片类型时上电失败");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("检测卡片类型时上电失败");
|
|
|
if (!IfUseRf())
|
|
|
{
|
|
|
if (IsInBusiness())
|
|
@@ -3238,7 +3242,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
|
|
|
else if (retDetectAndRead == -2){
|
|
|
if (!IfUseRf())
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("读取IC数据失败");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("读取IC数据失败");
|
|
|
if (m_issueStatus) {
|
|
|
SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", "");
|
|
|
}
|
|
@@ -3249,7 +3253,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
|
|
|
}
|
|
|
else //非终态,还有非接兜底
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("读取IC数据失败");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("读取IC数据失败");
|
|
|
if (m_issueStatus) {
|
|
|
SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220320", "");
|
|
|
}
|
|
@@ -3260,7 +3264,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
|
|
|
}else if (retDetectAndRead == -3){
|
|
|
if (!IfUseRf())
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("IC卡建立应用列表失败");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("IC卡建立应用列表失败");
|
|
|
if (m_issueStatus) {
|
|
|
SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", "");
|
|
|
}
|
|
@@ -3272,7 +3276,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
|
|
|
}
|
|
|
else //非终态,还有非接兜底
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("IC卡建立应用列表失败");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("IC卡建立应用列表失败");
|
|
|
if (m_issueStatus) {
|
|
|
SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220320", "");
|
|
|
}
|
|
@@ -3515,7 +3519,7 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
|
|
|
ICData aidFromBus(false, 0x4f, 0x00);
|
|
|
if (m_pCardProcess->FindTagValue(TAG_VECTOR_BUS, aidFromBus, false, 0) == -1)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<PreOnline_RF>, the front BusinessData han't provide aid data.");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<PreOnline_RF>, the front BusinessData han't provide aid data.");
|
|
|
int icRetryTimes = 0;
|
|
|
while (1)
|
|
|
{
|
|
@@ -3579,7 +3583,7 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
|
|
|
strResult = generateJsonStr(msgInfo);
|
|
|
CSimpleStringA csErrMsgWithReturnCode = strResult.second.c_str();
|
|
|
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("检测卡片类型时上电失败(非接)");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("检测卡片类型时上电失败(非接)");
|
|
|
|
|
|
if (m_issueStatus)
|
|
|
{
|
|
@@ -3612,7 +3616,7 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
|
|
|
}
|
|
|
else if (retDetectAndRead == -2) {
|
|
|
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("读取IC数据失败");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("读取IC数据失败");
|
|
|
if (m_issueStatus) {
|
|
|
SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_RFTypeABCommand, "DevAdapter::RFTypeABCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", "");
|
|
|
}
|
|
@@ -3624,7 +3628,7 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
|
|
|
}
|
|
|
else if (retDetectAndRead == -3) {
|
|
|
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("IC卡建立应用列表失败");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("IC卡建立应用列表失败");
|
|
|
if (m_issueStatus) {
|
|
|
SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_RFTypeABCommand, "DevAdapter::RFTypeABCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", "");
|
|
|
}
|
|
@@ -4154,7 +4158,7 @@ bool CCardIssuerFSM::SetCardRemains(const int num, const int hopper,bool bInit)
|
|
|
}
|
|
|
bool CCardIssuerFSM::SetCardMixed(const int num, const int hopper)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<SetCardMixed>, num:%d, hopper:%d, m_bSettingMaterial:%d", num, hopper, m_bSettingMaterial);
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<SetCardMixed>, num:%d, hopper:%d, m_bSettingMaterial:%d", num, hopper, m_bSettingMaterial);
|
|
|
CSmartPointer<IEntityFunction> spEntityFunction = GetEntityBase()->GetFunction();
|
|
|
CSmartPointer<IConfigInfo> spConfig;
|
|
|
ErrorCodeEnum eErrDev = spEntityFunction->OpenConfig(Config_Run, spConfig);
|
|
@@ -4212,7 +4216,7 @@ ErrorCodeEnum CCardIssuerFSM::MachineMoveCardBackNotHold()
|
|
|
//2016-11-10 14:30:54 joseph
|
|
|
if (eMoveNotHold != Error_Succeed)
|
|
|
{
|
|
|
- SetErrorAndLog(eMoveNotHold, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ SetErrorAndLog(eMoveNotHold, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "MachineMoveCardBackNotHold::MoveCard err");
|
|
|
return eMoveNotHold;
|
|
|
}
|
|
|
else {
|
|
@@ -4231,14 +4235,14 @@ ErrorCodeEnum CCardIssuerFSM::MachineMoveCardFrontGate(bool bInBussiness)
|
|
|
if (eMoveFrontGate != Error_Succeed){
|
|
|
if (m_bCardFromHopper)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("发卡,卡片吐出失败,请联系厂商检查卡嘴是否没对齐或是否有塞卡");
|
|
|
- SetErrorAndLog(eMoveFrontGate, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, bInBussiness, l_endTime - l_beginTime, "QLR040220305", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("发卡,卡片吐出失败,请联系厂商检查卡嘴是否没对齐或是否有塞卡");
|
|
|
+ SetErrorAndLog(eMoveFrontGate, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, bInBussiness, l_endTime - l_beginTime, "QLR040220305", "后端发卡,卡片吐出失败");
|
|
|
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("前端进卡,卡片吐出失败,请确认卡片是否平整");
|
|
|
- SetErrorAndLog(eMoveFrontGate, CardIssuer_UserErrorCode_MoveCardToGate_Failed, "DevAdapter::MoveCard", __FUNCTION__, bInBussiness, l_endTime - l_beginTime, "QLR040220305", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("前端进卡,卡片吐出失败,请确认卡片是否平整");
|
|
|
+ SetErrorAndLog(eMoveFrontGate, CardIssuer_UserErrorCode_MoveCardToGate_Failed, "DevAdapter::MoveCard", __FUNCTION__, bInBussiness, l_endTime - l_beginTime, "QLR040220305", "前端进卡,卡片吐出失败");
|
|
|
|
|
|
}
|
|
|
}
|
|
@@ -4520,9 +4524,9 @@ bool CCardIssuerFSM::JustReadCardNo()
|
|
|
|
|
|
if (eErr == Error_Succeed)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MagRead").setCostTime(l_endTime - l_beginTime)("JustReadCardNo::MagRead");
|
|
|
+ //DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MagRead").setCostTime(l_endTime - l_beginTime)("JustReadCardNo::MagRead");
|
|
|
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("MagRead JustReadCardNo, track[1].eStatus:%d, track[2].sStatus:%d, t2.dwSize:%d, t3.dwSize:%d, t2Len:%d, t3Len:%d",
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MagRead").setCostTime(l_endTime - l_beginTime)("JustReadCardNo::MagRead track[1].eStatus:%d, track[2].sStatus:%d, t2.dwSize:%d, t3.dwSize:%d, t2Len:%d, t3Len:%d",
|
|
|
magTracks.track[1].eStatus, magTracks.track[2].eStatus, magTracks.track[1].dwSize, magTracks.track[2].dwSize,
|
|
|
strlen((const char*)magTracks.track[1].data), strlen((const char*)magTracks.track[2].data));
|
|
|
|
|
@@ -4717,7 +4721,7 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
|
|
|
bool isSucc = rootRet["success"].asBool();
|
|
|
if (isSucc){
|
|
|
//成功
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR0402203Z02")("同步物料计数成功");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("同步物料计数成功");
|
|
|
return true;
|
|
|
}
|
|
|
else {
|
|
@@ -5285,7 +5289,7 @@ void CCardIssuerFSM::CloseAndClearDevObj(bool bCheckConnecting, bool bCloseOnly)
|
|
|
{
|
|
|
LOG_FUNCTION();
|
|
|
ErrorCodeEnum ec = Error_Unexpect;
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<CloseAndClearDevObj>, bCloseOnly:%d, m_bOpened:%d",
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<CloseAndClearDevObj>, bCloseOnly:%d, m_bOpened:%d",
|
|
|
bCloseOnly, m_bOpened);
|
|
|
if (m_hDevHelper != nullptr && !bCloseOnly)
|
|
|
{
|
|
@@ -5613,12 +5617,12 @@ int CCardIssuerFSM::CaptureJS(SpReqAnsContext<CardIssuerStandService_CaptureJS_R
|
|
|
CSimpleStringA maskCardno = MaskCardno(m_currCardNo.GetData());
|
|
|
m_currCardNo = m_addCardNo = "";
|
|
|
if (ctx != NULL) {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CaptureJS::GetDevStatus succ, No card found in cardReader, m_currCardNo=%s", maskCardno.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setLogCode("QLR040220343").setResultCode("RTA23CS")("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);//读卡器无卡
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CaptureJS::GetDevStatus succ, No card found in cardReader");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setLogCode("QLR040220343").setResultCode("RTA23CS")("CaptureJS::GetDevStatus succ, No card found in cardReader");
|
|
|
}
|
|
|
return 0;//回到无卡状态
|
|
|
}
|
|
@@ -5712,7 +5716,7 @@ int CCardIssuerFSM::IssueFromBoxJS(SpReqAnsContext<CardIssuerStandService_IssueF
|
|
|
long l_beginTime, l_endTime;
|
|
|
|
|
|
//Req.hopper
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("IssueCard, issue hopper:%d", ctx->Req.hopper);
|
|
|
+ //DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("IssueCard, issue hopper:%d", ctx->Req.hopper);
|
|
|
ctx->Ans.reserved1.Init(2);
|
|
|
|
|
|
//param Req.hopper is wrong
|
|
@@ -5830,16 +5834,17 @@ int CCardIssuerFSM::IssueFromBoxJS(SpReqAnsContext<CardIssuerStandService_IssueF
|
|
|
m_bCardFromHopper = true;//用于区分吐卡报错不同
|
|
|
if (errCode != Error_Succeed)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("IssueFromBoxJS::MoveCard err, m_currentHopper:%d", m_currentHopper);
|
|
|
+ CSimpleStringA errMsg = CSimpleStringA::Format("IssueFromBoxJS::MoveCard err, m_currentHopper:%d", m_currentHopper);
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(errMsg.GetData());
|
|
|
FSMSetIssueFlag(2);
|
|
|
- DWORD dwTmpUserErrCode = SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220345", "");
|
|
|
+ DWORD dwTmpUserErrCode = SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220345", errMsg.GetData());
|
|
|
ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
|
|
|
return 2;//S9
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040220345")("IssueCard::MoveCard succ, m_currentHopper:%d", m_currentHopper);
|
|
|
}
|
|
|
- LogWarn(Severity_Low, Error_Succeed, CardIssuer_UserErrorCode_MoveCard_FromHopper, "MoveCard from hopper succ.");
|
|
|
+ //LogWarn(Severity_Low, Error_Succeed, CardIssuer_UserErrorCode_MoveCard_FromHopper, "MoveCard from hopper succ.");
|
|
|
|
|
|
m_bUseRFTillNext = false;
|
|
|
Sleep(1000);
|
|
@@ -6104,7 +6109,7 @@ int CCardIssuerFSM::CheckCardType(CSimpleStringA cardNo, bool bReadMag, int& ICt
|
|
|
// 2b:其他情况(户口系统访问错(未走户口系统查或访问微服务失败或未返回介质类型或返回纯磁条卡),一律探测是否芯片卡
|
|
|
if (m_issueStatus && bReadMag)//发卡默认给芯片卡,且读到磁道(考虑卡片放错)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<CheckCardType>, issueStatus is true and read mag OK");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<CheckCardType>, issueStatus is true and read mag OK");
|
|
|
ICtype = 1;
|
|
|
}
|
|
|
else {
|
|
@@ -6264,7 +6269,8 @@ int CCardIssuerFSM::CheckCardType(CSimpleStringA cardNo, bool bReadMag, int& ICt
|
|
|
}
|
|
|
|
|
|
CSimpleStringA cardType = CSimpleStringA::Format("cardType:%d", ICtype);
|
|
|
- LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_CardType, cardType.GetData());
|
|
|
+ //LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_CardType, cardType.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(cardType.GetData());
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -6273,7 +6279,7 @@ int CCardIssuerFSM::PreOnlineJS_Contact(SpReqAnsContext<CardIssuerStandService_R
|
|
|
LOG_FUNCTION();
|
|
|
long l_beginTime, l_endTime;
|
|
|
DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("(PreOnlineJS_Contact) IC接触读卡");
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("PreOnlineJS_Contact, aid[%s], business data[%s]", ctx->Req.aid.GetData(), ctx->Req.businessData.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("PreOnlineJS_Contact, aid[%s], business data[%s]", ctx->Req.aid.GetData(), ctx->Req.businessData.GetData());
|
|
|
|
|
|
m_pCardProcess->DataInit();
|
|
|
//数据已读出,开始pmoc流程
|
|
@@ -6671,10 +6677,10 @@ int CCardIssuerFSM::PreOnlineJS_RF(SpReqAnsContext<CardIssuerStandService_ReadJS
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime)("PreOnlineJS_RF::MoveCard, (CI_MOVECARD_RF_POSITION)");
|
|
|
}
|
|
|
else {
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220340", "");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220340", "PreOnlineJS_RF::MoveCard err");
|
|
|
}
|
|
|
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("PreOnlineJS_RF, aid[%s], business data[%s]", ctx->Req.aid.GetData(), ctx->Req.businessData.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("PreOnlineJS_RF, aid[%s], business data[%s]", ctx->Req.aid.GetData(), ctx->Req.businessData.GetData());
|
|
|
|
|
|
m_pCardProcess->DataInit();
|
|
|
//数据已读出,开始pmoc流程
|
|
@@ -7068,7 +7074,7 @@ int CCardIssuerFSM::ReadJS(SpReqAnsContext<CardIssuerStandService_ReadJS_Req, Ca
|
|
|
ctx->Answer(Error_Succeed);//单磁条直接返回
|
|
|
}
|
|
|
else if (ICtype == 1 || ICtype == 3) {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("to PreOnline");//联机上电
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("to PreOnline");//联机上电
|
|
|
ctx->Ans.icState = 0;//默认值
|
|
|
ctx->Ans.icMode = -1;//默认值
|
|
|
if (m_bUseRFTillNext) {
|
|
@@ -7131,7 +7137,8 @@ int CCardIssuerFSM::InsertJS(SpReqAnsContext<CardIssuerStandService_InsertJS_Req
|
|
|
if (rc == 0) {
|
|
|
FSMSetIssueFlag(0);
|
|
|
m_bCardFromHopper = false;
|
|
|
- LogWarn(Severity_Low, Error_Succeed, CardIssuer_UserErrorCode_InsertCardSucceed, "InsertJS, insert succeed");
|
|
|
+ //LogWarn(Severity_Low, Error_Succeed, CardIssuer_UserErrorCode_InsertCardSucceed, "InsertJS, insert succeed");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("InsertJS, insert succeed");
|
|
|
m_bUseRFTillNext = false;
|
|
|
ctx->Answer(Error_Succeed);
|
|
|
}
|
|
@@ -7206,8 +7213,8 @@ int CCardIssuerFSM::InternalInsert()
|
|
|
bHasSetCardInType = true;
|
|
|
}
|
|
|
else {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("InternalInsert::SetCardInType CI_CARD_IN_TYPE_ALL err");
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("InternalInsert::SetCardInType CI_CARD_IN_TYPE_ALL err");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "InternalInsert::SetCardInType CI_CARD_IN_TYPE_ALL err");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -7234,8 +7241,8 @@ int CCardIssuerFSM::InternalInsert()
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
if (Error_Succeed != eErr)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("InternalInsert::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN err");
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("InternalInsert::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN err");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "InternalInsert::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("InternalInsert::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN");
|
|
@@ -7271,8 +7278,8 @@ int CCardIssuerFSM::InternalInsert()
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
if (Error_Succeed != eErr)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("InternalInsert::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN err");
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("InternalInsert::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN err");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "InternalInsert::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN err");
|
|
|
}
|
|
|
else {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("InternalInsert::SetCardInType CI_CARD_IN_TYPE_FORBIDDEN");
|
|
@@ -7374,7 +7381,7 @@ int CCardIssuerFSM::QuickSelfCheckImpl()
|
|
|
{
|
|
|
//通知健康快速自检
|
|
|
LOG_FUNCTION();
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("QuickSelfCheckImpl")("快速自检开始");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("QuickSelfCheckImpl")("快速自检开始");
|
|
|
int ret = 0;//失败
|
|
|
ErrorCodeEnum eErr = Error_Unexpect;
|
|
|
HealthManager::HealthManagerService_ClientBase* pClient = new HealthManager::HealthManagerService_ClientBase(GetEntityBase());
|
|
@@ -7386,7 +7393,7 @@ int CCardIssuerFSM::QuickSelfCheckImpl()
|
|
|
req1.name = "CardIssuerStand";
|
|
|
if (Error_Succeed == (*pClient)(EntityResource::getLink().upgradeLink())->RealCheck(req1, ans1, 10000))
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("QuickSelfCheckImpl")("RealCheck success");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("QuickSelfCheckImpl")("RealCheck success");
|
|
|
ret = 1;
|
|
|
}
|
|
|
else {
|
|
@@ -7414,7 +7421,7 @@ int CCardIssuerFSM::PowerOffIC(int type)
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
|
|
|
if (eErr != Error_Succeed) {
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard, "DevAdapter::DeactivateICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard, "DevAdapter::DeactivateICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "PowerOffIC::DeactivateICCard err");
|
|
|
ret = 1;
|
|
|
}
|
|
|
else {
|
|
@@ -7426,7 +7433,7 @@ int CCardIssuerFSM::PowerOffIC(int type)
|
|
|
l_endTime = GetTickCountRVC();
|
|
|
|
|
|
if (eErr != Error_Succeed) {
|
|
|
- SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReleaseIC, "DevAdapter::ReleaseIC", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
|
|
|
+ SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReleaseIC, "DevAdapter::ReleaseIC", __FUNCTION__, false, l_endTime - l_beginTime, "", "PowerOffIC::ReleaseIC err");
|
|
|
ret = 1;
|
|
|
}
|
|
|
else {
|
|
@@ -7452,5 +7459,5 @@ int CCardIssuerFSM::PowerOffIC(int type)
|
|
|
|
|
|
void CCardIssuerFSM::OnStateTrans(int iSrcState, int iDstState)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("trans from %s to %s", GetStateName(iSrcState), GetStateName(iDstState));
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("trans from %s to %s", GetStateName(iSrcState), GetStateName(iDstState));
|
|
|
}
|