#IQRV #comment [Mixed] 杂碎的日志优化

Module/include/DevFSMCommBase.hpp

@@ -437,6 +437,10 @@ public:
 		DWORD dwCode = GetAlarmDEC();
 		if (alarmOrNot) {
             LogErrMsgEx(errPkg, csErrMsg, dwCode, bToBusiness);
+		} else {
+            const CSimpleStringA alarmMsg = CSimpleStringA::Format("{\"DevSN\":\"%s\", \"Prefix\":\"%s\", \"Code\":\"%s\", \"Msg\":\"%s\"}"
+                                                                   , errPkg.devSN.GetData(), errPkg.msgHead.GetData(), SpStrError(errPkg.devErrCode), csErrMsg);
+			Dbg(alarmMsg.GetData());
 		}
 		return dwCode;
 	}
@@ -714,14 +718,11 @@ inline void CCommDevFSM<TFSM, TDevClass>::LogErrMsgEx(ErrorPackage errPkg, const
 {
 	const CSimpleStringA alarmMsg = CSimpleStringA::Format("{\"DevSN\":\"%s\", \"Prefix\":\"%s\", \"Code\":\"%s\", \"Msg\":\"%s\"}"
                            , errPkg.devSN.GetData(), errPkg.msgHead.GetData(), SpStrError(errPkg.devErrCode), pMsgBody);
-
-	if (bToBusiness) {
+    if (bToBusiness) {
         LogError(Severity_High, errPkg.devErrCode, finalErrCode, alarmMsg.GetData());
-    }
-	else {
+    } else {
         LogWarn(Severity_High, errPkg.devErrCode, finalErrCode, alarmMsg.GetData());
-	}
-
+    }
 	return;
 }
 

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -1474,17 +1474,15 @@ int CIDCertFSM::Initial()
 		}
 	} while (!m_hDevHelper && bOpenFlag == false);
 	
-	if (m_hDevHelper)
-	{
-		err = m_hDevHelper->IDCerRFControl(false);
-		if (err != Error_Succeed) {
-			SetErrPackage(m_errPkg, "Initial::IDCerRFControl", m_devSN, err, MEC_DEVAPI_IDCER_IDCerRFControl);
-			AlarmDEC(m_errPkg);
-		}
-		else {
-			Dbg("close rf ok.");
-		}
-	}
+    if (m_hDevHelper) {
+        err = m_hDevHelper->IDCerRFControl(false);
+        if (err != Error_Succeed) {
+            SetErrPackage(m_errPkg, "Initial::IDCerRFControl", m_devSN, err, MEC_DEVAPI_IDCER_IDCerRFControl);
+            AlarmDEC(m_errPkg, false, false);
+        } else {
+            Dbg("close rf ok.");
+        }
+    }
 	memset(m_devCatInfo.szModel, 0, MAX_DEV_MODEL_LEN);
 	memset(m_devCatInfo.szType, 0, MAX_DEV_TYPE_LEN);
 	memset(m_devCatInfo.szVendor, 0, MAX_DEV_VENDOR_LEN);
@@ -1499,12 +1497,10 @@ int CIDCertFSM::Initial()
 		AlarmDEC(m_errPkg);
 	}
 
-	if (m_hDevHelper)
-	{
-		m_devInit = true;
-		return 0;
-	}
-	else {
+    if (m_hDevHelper) {
+        m_devInit = true;
+        return 0;
+    } else {
         return 2;
-	}
+    }
 }

Module/mod_cardissuer/CardIssuerFSM.cpp

@@ -3211,7 +3211,8 @@ int CCardIssuerFSM::ReadCard(SpReqAnsContext<CardIssuerService_Read_Req,CardIssu
 		if (bIC)
 		{
 			eErr = m_hDevHelper->DeactivateICCard();
-			if (eErr != Error_Succeed) {
+			///**TODO(Gifur@9/16/2022): 广电需要优化对 Error_NotImpl的输出，这里先由框架做兼容 */
+			if (eErr != Error_Succeed && eErr != Error_NotImpl) {
 				SetErrPackage(m_errPkg, "ReadCard::DeactivateICCard", m_csDevSN, eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard);
 				AlarmDEC(m_errPkg);
 			}