Explorar o código

Z991239-6274 #comment feat: 精简埋点日志

Signed-Off-By: commit-hook
刘文涛80174520 hai 6 meses
pai
achega
db8040a30c
Modificáronse 1 ficheiros con 21 adicións e 15 borrados
  1. 21 15
      Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

+ 21 - 15
Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -3119,7 +3119,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 	ICData aidFromBus(false, 0x4f, 0x00);
 	if (m_pCardProcess->FindTagValue(TAG_VECTOR_BUS, aidFromBus, false, 0) == -1)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<PreOnline>, the front BusinessData han't provide aid data.");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<PreOnline>, the front BusinessData han't provide aid data.");
 		int icRetryTimes = 0;
 		while (1)
 		{
@@ -3968,7 +3968,7 @@ void CCardIssuerFSM::SelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactio
 
 bool CCardIssuerFSM::FSMSetIssueFlag(int value)
 {
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("FSMSetIssueFlag, value:%d,from file:%d", value, m_issueStatusFromFile);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("FSMSetIssueFlag, value:%d,from file:%d", value, m_issueStatusFromFile);
 	if (value == 0 && m_issueStatusFromFile >1)
 	{
 		//oilyang@20171220 如果曾经卡片卡住,但启动时没有发现卡片,则更新本次发卡方向但不写文件,以防后续卡片被移动到卡槽
@@ -3987,18 +3987,21 @@ bool CCardIssuerFSM::FSMSetIssueFlag(int value)
 	CSmartPointer<IConfigInfo> spConfig;
 	ErrorCodeEnum eErrDev = spEntityFunction->OpenConfig(Config_Run, spConfig);
 	if (eErrDev != Error_Succeed) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("(FSMSetIssueFlag)open cfg file failed!");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("(FSMSetIssueFlag) open cfg file failed!");
 		return false;
 	}
-
-	if (spConfig->WriteConfigValueInt("all", "IsIssue", value) == Error_Succeed)
+	eErrDev = spConfig->WriteConfigValueInt("all", "IsIssue", value);
+	if (eErrDev == Error_Succeed) {
 		return true;
-	else
+	}
+	else {
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("(FSMSetIssueFlag) write IsIssue err:%d, value:%d", eErrDev, value);
 		return false;
+	}
 }
 bool CCardIssuerFSM::SetCardCaptured(const int num,bool bClear)
 {
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<SetCardCaptured>, num:%d, bClear:%d, m_maxRetainCount:%d, m_bSettingMaterial:%d",
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<SetCardCaptured>, num:%d, bClear:%d, m_maxRetainCount:%d, m_bSettingMaterial:%d",
 		num, bClear, m_maxRetainCount, m_bSettingMaterial);
 	if (num < 0)
 	{
@@ -4016,7 +4019,8 @@ bool CCardIssuerFSM::SetCardCaptured(const int num,bool bClear)
 	if (num >= m_maxRetainCount)
 		LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_RETAIN_BIN_IS_FULL, "<SetCardCaptured>, 回收箱满了,请及时清理!");
 
-	if (spConfig->WriteConfigValueInt("all", "CardCaptured", num) == Error_Succeed)
+	eErrDev = spConfig->WriteConfigValueInt("all", "CardCaptured", num);
+	if (eErrDev == Error_Succeed)
 	{
 		if (bClear && !m_bSettingMaterial)
 		{
@@ -4026,12 +4030,14 @@ bool CCardIssuerFSM::SetCardCaptured(const int num,bool bClear)
 		}
 		return true;
 	}
-	else
+	else {
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardCaptured>, write CardCaptured err:%d, num:%d, bClear:%d", eErrDev, num, bClear);
 		return false;
+	}
 }
 bool CCardIssuerFSM::SetCardIssued(const int num, const int hopper)
 {
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<SetCardIssued>, num :%d, hopper: %d, m_bSettingMaterial:%d", num, hopper, m_bSettingMaterial);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<SetCardIssued>, 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);
@@ -4065,13 +4071,13 @@ bool CCardIssuerFSM::SetCardIssued(const int num, const int hopper)
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardIssued>, write CardIssued err:%d", eErrDev);
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardIssued>, write CardIssued err:%d, num :%d, hopper: %d", eErrDev, num, hopper);
 		return false;
 	}
 }
 bool CCardIssuerFSM::SetCardRemains(const int num, const int hopper,bool bInit)
 {
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<SetCardRemains>, num:%d,, hopper:%d, bInit:%d, m_currentHopper:%d, m_bSettingMaterial:%d",
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<SetCardRemains>, num:%d, hopper:%d, bInit:%d, m_currentHopper:%d, m_bSettingMaterial:%d",
 		num, hopper, bInit, m_currentHopper, m_bSettingMaterial);
 	if (num == 0)
 	{
@@ -4135,7 +4141,7 @@ bool CCardIssuerFSM::SetCardRemains(const int num, const int hopper,bool bInit)
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardRemains>, write CardRemains err:%d", eErrDev);
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA23CZ")("<SetCardRemains>, write CardRemains err:%d, num:%d, hopper:%d, bInit:%d", eErrDev, num, hopper, bInit);
 		return false;
 	}
 	return true;
@@ -4616,7 +4622,7 @@ bool CCardIssuerFSM::RegistCardWhileCaptureCard(CSimpleStringA cardno)
 
 bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo syncInfo) {
 
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("<SyncMaterialCount>, 同步物料计数开始, DeviceNo = %s, CardBoxNum = %d", syncInfo.strDeviceNo.GetData(), syncInfo.dwCardBoxNum);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("<SyncMaterialCount>, 同步物料计数开始, DeviceNo = %s, CardBoxNum = %d", syncInfo.strDeviceNo.GetData(), syncInfo.dwCardBoxNum);
 
 	if (syncInfo.strDeviceNo == NULL || strlen(syncInfo.strDeviceNo) == 0)
 	{
@@ -5318,7 +5324,7 @@ int CCardIssuerFSM::JudgeCardType(CSimpleStringA cardno, bool& bMismatch)
 				cardType = 3;
 			else if (qCardTypeRet.BODY.z1.zPsbMdm.compare("M") == 0)
 				cardType = 1;
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("Query card type from host is:%s,zPsbSeq:%s"
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("Query card type from host is:%s,zPsbSeq:%s"
 				, qCardTypeRet.BODY.z1.zPsbMdm.c_str(), qCardTypeRet.BODY.z1.zPsbSeq.c_str()));
 			int eacLen = qCardTypeRet.BODY.z1.zEacNbr.length();
 			if (eacLen > 7 && cardno.Compare(qCardTypeRet.BODY.z1.zEacNbr.c_str()) != 0)