Z991239-6274 #comment feat: 规范日志

Signed-Off-By: commit-hook

Module/mod_CardIssuerStand/CardIssuerStandFSM.h

@@ -648,7 +648,7 @@ typedef struct CQueryCardTypeRet : CHTTPRet {
 		Json::Value::UInt index;
 		if (!reader.parse(strData, root, false))
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("reader.parse false");//又不能打印，有什么太大意义?
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("reader.parse false");
 			return false;
 		}
 		index = 0;
@@ -713,7 +713,7 @@ typedef struct CRegistSwallowCardRet : CHTTPRet {
 		Json::Reader reader;
 		if (!reader.parse(strData, root, false))
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("reader.parse false");//又不能打印，有什么太大意义?
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("reader.parse false");
 			return false;
 		}
 		if (!root["returnInfo"].isNull()) {
@@ -1167,6 +1167,12 @@ public:
 	void SetDoExitFlag(bool bFlag) { m_bDoExit = bFlag; }
 	int PowerOffIC(int type);//0:接触IC 1：非接
 	virtual void OnStateTrans(int iSrcState, int iDstState);
+
+	CSimpleStringA getRTACode(DWORD dwUserCode) {
+		CSimpleStringA rtaMsg = this->GetEntityBase()->GetFunction()->UserCodeToRTACode(dwUserCode);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("rtaMsg=%s", rtaMsg.GetData());
+		return rtaMsg;
+	}
 private:
 	bool m_bCancelInsert;
 	bool m_quickSelfcheck;
@@ -1215,7 +1221,7 @@ struct IssueTask : public ITaskSp
 			e = new FSMEvent(USER_EVT_ISSUE_EX_FINISHED);
 		else
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("IssueTask:ctx is null");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("IssueTask:ctx is null");
 			return;
 		}
 		e->param1 = fsm->IssueCard(ctx,ctxEx);

Module/mod_CardIssuerStand/mod_cardissuerStand.h

@@ -332,7 +332,7 @@ public:
 		else if (_stricmp(m_fsm.GetCurrStateName(), "Hold") != 0) {
 			DWORD errCode = m_fsm.GetFsmStateErrCode();
 			int state = m_fsm.GetFSMState();
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("ReadJS req is unhandled ,CurrState=%d", state);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode(m_fsm.getRTACode(errCode))("ReadJS req is unhandled ,CurrState=%d", state);
 			ctx->Answer(Error_Unexpect, errCode);
 		}
 		else {
@@ -351,7 +351,7 @@ public:
 		else if (_stricmp(m_fsm.GetCurrStateName(), "Hold") != 0) {
 			DWORD errCode = m_fsm.GetFsmStateErrCode();
 			int state = m_fsm.GetFSMState();
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("PostOnlineJS req is unhandled ,CurrState=%d", state);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode(m_fsm.getRTACode(errCode))("PostOnlineJS req is unhandled ,CurrState=%d", state);
 			ctx->Answer(Error_Unexpect, errCode);
 		}
 		else {
@@ -370,7 +370,7 @@ public:
 		else if (_stricmp(m_fsm.GetCurrStateName(), "Hold") != 0) {
 			DWORD errCode = m_fsm.GetFsmStateErrCode();
 			int state = m_fsm.GetFSMState();
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("EjectJS req is unhandled ,CurrState=%d", state);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode(m_fsm.getRTACode(errCode))("EjectJS req is unhandled ,CurrState=%d", state);
 			ctx->Answer(Error_Unexpect, errCode);
 		}
 		else {
@@ -394,7 +394,7 @@ public:
 		else {
 			DWORD errCode = m_fsm.GetFsmStateErrCode();
 			int state = m_fsm.GetFSMState();
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CaptureJS req is unhandled ,CurrState=%d", state);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode(m_fsm.getRTACode(errCode))("CaptureJS req is unhandled ,CurrState=%d", state);
 			ctx->Answer(Error_Unexpect, errCode);
 		}
 
@@ -419,7 +419,7 @@ public:
 		else if (_stricmp(m_fsm.GetCurrStateName(), "Idle") != 0) {
 			DWORD errCode = m_fsm.GetFsmStateErrCode();
 			int state = m_fsm.GetFSMState();
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("IssueFromBoxJS req is unhandled ,CurrState=%d", state);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode(m_fsm.getRTACode(errCode))("IssueFromBoxJS req is unhandled ,CurrState=%d", state);
 			ctx->Answer(Error_Unexpect, errCode);
 		}
 		else {
@@ -437,7 +437,7 @@ public:
 		else if (_stricmp(m_fsm.GetCurrStateName(), "Idle") != 0) {
 			DWORD errCode = m_fsm.GetFsmStateErrCode();
 			int state = m_fsm.GetFSMState();
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("InsertJS req is unhandled ,CurrState=%d", state);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode(m_fsm.getRTACode(errCode))("InsertJS req is unhandled ,CurrState=%d", state);
 			ctx->Answer(Error_Unexpect, errCode);
 		}
 		else {