!10755 去掉VtmLoader的实体启动耗时告警，整合pinpad获取密文告警

Merge pull request !10755 from 80174847/oilyang_fixed_everything

Module/mod_healthmanager/HealthManagerFSM.cpp

@@ -757,6 +757,7 @@ void CHealthManagerFSM::ToLogWarnTermAboutInfo()
 		termStartInfo["AccessAuthResult"] = CSimpleStringA::Format("%d", m_iAccessAuth);
 		
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("TerminalStartCost")("%s", generateJsonStr(termStartInfo).second.c_str());
+		LogWarn(Severity_Low, Error_Debug, HealthManager_UserErrorCode_TerminalAppLoadInfo, generateJsonStr(termStartInfo).second.c_str());
 	}
 	QueryAndSaveDNS();
 	QueryAndSendCPUInfo();

Module/mod_healthmanager/HealthManagerFSM.h

@@ -45,7 +45,7 @@ enum HealthManger_UserErrorCode {
 	HealthManager_UserErrorCode_Need_Guardian = 0x50100210,				//健康需要启动guardian
 	HealthManager_UserErrorCode_Need_No_Guardian = 0x50100211,			//健康不需要启动guardian	
 	HealthManager_UserErrorCode_WaitForAccessAuthEntityIdle = 0x50100212,	//健康等待准入启动正常
-	HealthManager_UserErrorCode_First_Info_AboutPC = 0x50100213,			//健康启动结束后第一次上送计算机信息(主要是确定pad的归属厂商信息)
+	HealthManager_UserErrorCode_TerminalAppLoadInfo = 0x50100213,			//终端应用启动过程信息
 	//
 	HealthManager_UserErrorCode_PrivilegeCMD = 0x50100215,				//上送终端收到的启动、重启事件（非关门页、用户桌面？需要调查后理清楚）
 	HealthManager_UserErrorCode_SogouInput_UsingSys = 0x50100216,    // 使用普通调用的搜狗输入法

Module/mod_pinpad/PinPadFSM.cpp

@@ -800,10 +800,13 @@ Err:
 	m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 	errCode = m_hDevHelper->GetPinBlock(pinBlk);
 	m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
-
 	
-	LogWarn(Severity_Low, Error_Succeed, PinPad_UserErrorCode_PinPad_GetPinBlock_Call
-		, CSimpleStringA::Format("{\"cost\":%d}", m_ullEndTime - m_ullBeginTime));
+	ULLINT ullGetPinBlockCost = m_ullEndTime - m_ullBeginTime;
+	char* tmpCheckCode = new char[MAX_PIN_BLOCK_SIZE];
+	if (tmpCheckCode == NULL)
+		return Error_Resource;
+	memset(tmpCheckCode, 0, MAX_PIN_BLOCK_SIZE);
+
 	if (errCode == Error_Succeed)
 	{
 		char* tmpPinData = new char[MAX_PIN_BLOCK_SIZE];
@@ -853,15 +856,9 @@ Err:
 		}
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::EncryptData").setCostTime(m_ullEndTime - m_ullBeginTime)();
 
-		char* tmpCheckCode = new char[MAX_PIN_BLOCK_SIZE];
-		if (tmpCheckCode == NULL)
-			return Error_Resource;
-		memset(tmpCheckCode, 0, MAX_PIN_BLOCK_SIZE);
 		//HexBuf2StrBuf(dstInfo.data,&tmpCheckCode,dstInfo.dwSize);
 		memcpy(tmpCheckCode, dstInfo.data, dstInfo.dwSize);
 
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ckckck[%s], m_keySNSM:%s", tmpCheckCode, m_keySNSM.GetData());
-
 
 		if (strnicmp(tmpCheckCode, "9F1F7BFF6F5511384D9430531E538FD3", strlen("9F1F7BFF6F5511384D9430531E538FD3")) == 0)
 			SetErrorAndLog(Error_Unexpect, PinPad_UserErrorCode_KEY_LOST_SM, "", __FUNCTION__);
@@ -895,8 +892,14 @@ Err:
 		ctxSM->Answer(Error_DevCommFailed, dwUserCode);
 		return Error_DevCommFailed;
 	}
+	map<string, string> encryptTextInfo;
+	encryptTextInfo["text"] = "获取密文成功";
+	encryptTextInfo["ckCode"] = tmpCheckCode;
+	encryptTextInfo["keySN"] = m_keySNSM.GetData();
+	encryptTextInfo["getPinBlockCost"] = CSimpleStringA::Format("%d",ullGetPinBlockCost).GetData();
+
 	DbgWithLink(LOG_LEVEL_INFO, ctxSM->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setLogCode(PinPadService_LogCode_GetInputSM)
-		.setAPI("DevAdapter::GetPinBlock").setCostTime(m_ullEndTime - m_ullBeginTime)("获取密文成功");
+		.setAPI("DevAdapter::GetPinBlock").setCostTime(m_ullEndTime - m_ullBeginTime)("%s", generateJsonStr(encryptTextInfo).second.c_str());
 	//oilyang@20240410 move to out space,after stopinput & turn off the light
 	//Sleep(100);
 	//ctxSM->Answer(Error_Succeed);

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -1553,8 +1553,8 @@ void CVtmLoaderFSM::NoticeEntityLoad(int evtCode)
 	{
 		if (m_csEntityList.IndexOf(strEntityNames[i]) != -1)
 		{
-			LogWarn(Severity_Low, Error_Debug, LOG_TRACE_ENTITY_START_TIME,
-				SP::Module::Util::generateConsumeTimeJson(strEntityNames[i], SP::Module::Util::formatTime(Infos[i].startTime).c_str(), GetDualTime(Infos[i].startTime, Infos[i].startEndTime)).GetData());
+			//LogWarn(Severity_Low, Error_Debug, LOG_TRACE_ENTITY_START_TIME,
+			//	SP::Module::Util::generateConsumeTimeJson(strEntityNames[i], SP::Module::Util::formatTime(Infos[i].startTime).c_str(), GetDualTime(Infos[i].startTime, Infos[i].startEndTime)).GetData());
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("EntityStartCost")
 				(SP::Module::Util::generateConsumeTimeJson(strEntityNames[i], SP::Module::Util::formatTime(Infos[i].startTime).c_str(), GetDualTime(Infos[i].startTime, Infos[i].startEndTime)).GetData());
 		}