Browse Source

Z991239-5580 #comment feat: RTA错误码对应补充

陈纪林80310970 1 year ago
parent
commit
559fad41aa

+ 2 - 0
Module/include/EventCode.h

@@ -203,6 +203,8 @@ static const char* Device_Type_Table[] = {
 #define ERR_ACCESSAUTH_SET_LOCALE_TIME               0x50210006  //设置本地时间错误
 #define ERR_ACCESSAUTH_GET_SYS_VAR                   0x50210007  //获取系统变量错误
 #define ERR_ACCESSAUTH_GET_TERMINAL_FINGERPRINT      0x50210008  //获取终端设备的指纹错误
+#define ERR_ACCESSAUTH_GET_IP_FAILED				 0x50210009  //获取终端设备的IP地址失败
+#define ERR_ACCESSAUTH_GET_MAC_FAILED				 0x5021000A  //获取终端设备的MAC地址失败
 
 #define ERR_ACCESSAUTH_CONNECT_PINPAD					0x50220001  //连接pinpad错误
 #define ERR_ACCESSAUTH_FROM_PINPAD						0x50220002  //来自pinpad的错误

+ 1 - 1
Module/mod_accessauth/AccessAuthFSM.cpp

@@ -329,7 +329,7 @@ struct UpdateWKTask : ITaskSp
 		else {
 			m_fsm->doWarnMsg(ERROR_ACCESSAUTH_CONNECT_ACS,
 				GetOutPutStr("%s%s", "连接总行ACS准入服务失败(UpdateWKTask).", result.WhatError().c_str()).c_str(), true);
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA520G")("UpdateWKTask Connect Failed.");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA5212")("UpdateWKTask Connect Failed.");
 	}
 
 	UpdateWKRetError:

+ 7 - 5
Module/mod_accessauth/mod_AccessAuth.cpp

@@ -694,9 +694,9 @@ bool CAccessAuthEntity::GetTerminalFingerPrint(BYTE *pBuf, int &nBufLen)
 		strErrMsg = CSimpleStringA::Format("查询CPU ID失败,请重启机器并重新初始化");
 		SetAuthErrMsg((const char*)strErrMsg);
 
-		m_FSM.doWarnMsg(ERR_ACCESSAUTH_GET_TERMINAL_FINGERPRINT,
+		m_FSM.doWarnMsg(ERROR_ACCESSAUTH_GETCPUID,
 			GetOutPutStr("%s%s", "Processor", "False").c_str());
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA5203")
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA5213")
 			(GetOutPutStr("%s%s", "Processor", "False").c_str());
 		return false;
 	}
@@ -708,9 +708,9 @@ bool CAccessAuthEntity::GetTerminalFingerPrint(BYTE *pBuf, int &nBufLen)
 		strErrMsg = CSimpleStringA::Format("查询主板序列号失败,  请重启机器并重新初始化");
 		SetAuthErrMsg((const char*)strErrMsg);
 
-		m_FSM.doWarnMsg(ERR_ACCESSAUTH_GET_TERMINAL_FINGERPRINT,
+		m_FSM.doWarnMsg(ERROR_ACCESSAUTH_GETBASEBOARDSN,
 			GetOutPutStr("%s%s", "BaseBoard", "False").c_str());
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA5203")
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA5214")
 			(GetOutPutStr("%s%s", "BaseBoard", "False").c_str());
 		return false;
 	}
@@ -725,8 +725,10 @@ bool CAccessAuthEntity::GetTerminalFingerPrint(BYTE *pBuf, int &nBufLen)
 		strErrMsg = CSimpleStringA::Format("查询磁盘序列号失败, 请重启机器并重新初始化");
 		SetAuthErrMsg((const char*)strErrMsg);
 
-		m_FSM.doWarnMsg(ERR_ACCESSAUTH_GET_TERMINAL_FINGERPRINT,
+		m_FSM.doWarnMsg(ERROR_ACCESSAUTH_DISKDRIVESN,
 			GetOutPutStr("%s%s", "DiskDrive", "False").c_str());
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA5215")
+			(GetOutPutStr("%s%s", "DiskDrive", "False").c_str());
 		return false;
 	}
 	strRet += "|";