Z991239-5798 #comment feat: 调整告警信息，上送各个位置情况下的身份证退卡异常信息

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -946,9 +946,9 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 					{
 						SetErrorAndLog(errEject, MEC_DEVAPI_IDCER_ForceIDEject, "DevAdapter::ForceIDEject", __FUNCTION__,
 							false, m_ullEndTime - m_ullBeginTime);
-
-						CheckEjectCardRes();
 					}
+
+					CheckEjectCardRes(eErr1, errEject);
 				}
 				else
 				{
@@ -1009,9 +1009,9 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 			{
 				SetErrorAndLog(errEject, MEC_DEVAPI_IDCER_ForceIDEject, "DevAdapter::ForceIDEject", __FUNCTION__,
 					false, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8);
-				
-				CheckEjectCardRes();
 			}
+
+			CheckEjectCardRes(errRf, errEject);
 		}
 		else
 		{
@@ -2258,7 +2258,7 @@ void CIDCertFSM::CheckHanZi(UINT16* ucs2_code)
 	}
 }
 
-void CIDCertFSM::CheckEjectCardRes() 
+void CIDCertFSM::CheckEjectCardRes(ErrorCodeEnum errRf, ErrorCodeEnum errForceIDEject)
 {
 	int pos = 99;
 	m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
@@ -2269,9 +2269,10 @@ void CIDCertFSM::CheckEjectCardRes()
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::QueryCardPos")
 			.setCostTime(m_ullEndTime - m_ullBeginTime)
-			("ForceEject fail, Check card pos suc, pos : %d", pos);
+			("吐卡失败, 获取卡片位置成功, pos : %d", pos);
 
-		CSimpleStringA warnMsg = CSimpleStringA::Format("ForceEject return failed. Check Card pos = %d.", pos);
+		CSimpleStringA warnMsg = CSimpleStringA::Format("吐卡异常。RFControl返回:%s. ForceIDEject返回%s. 获取卡片位置 pos = %d.", 
+			SpStrError(errRf), SpStrError(errForceIDEject), pos);
 		switch (pos)
 		{
 		case 0:
@@ -2296,7 +2297,7 @@ void CIDCertFSM::CheckEjectCardRes()
 		SetErrorAndLog(posErr, MEC_DEVAPI_IDCER_QueryCardPos, "DevAdapter::QueryCardPos", __FUNCTION__,
 			false, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8);
 
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("ForceEject fail, Check card pos failed.", posErr);
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("吐卡失败, 获取卡片位置失败.", posErr);
 	}
 }
 

Module/mod_IDCertificate/IDCertFSM.h

@@ -277,7 +277,7 @@ private:
 	int GetUCS2ByteLength(UINT16* ucs2_code);
 	void CheckHanZi(UINT16* ucs2_code);
 
-	void CheckEjectCardRes(); //退卡情况收集，cjl-2024.11.21
+	void CheckEjectCardRes(ErrorCodeEnum errRf, ErrorCodeEnum errForceIDEject); //退卡情况收集，cjl-2024.11.21
 
 public:
 		std::string checkImgURL;