#IQRV #comment ToLogWarnInfoAboutTerm 移除

Module/include/DevFSMCommBase.hpp

@@ -603,14 +603,7 @@ class CCommDevFSM : public FSMImpl<TFSM>
 public:
 	CCommDevFSM() :m_FirstStart(TRUE), m_iInWhatPage(PageType_Init),m_bOpened(false), m_bOpening(true), m_eDevState(DEVICE_STATUS_NOT_READY),m_contiErrTimes(0)
 	{
-		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("CardIssuerStand", 0x2030021f));
-		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("CardIssuerStore", 0x2200021f));
-		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("ContactlessCard", 0x21300203));
-		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("FingerPrint", 0x20400211));
-		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("IDCertificate", 0x20100202));
-		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("PinPad", 0x20600207));
-		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("Gpio", 0x20900201));
-		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("HSPScanner", 0x21700207));
+
 	}
 
 	ErrorCodeEnum GetAndSplitDevErrInfo(
@@ -788,115 +781,6 @@ public:
 
 #endif //_MSC_VER
 
-	/** upload adapter file's hash value and open param as well as dev category information, return if information has uploaded this time*/
-	bool ToLogWarnInfoAboutTerm()
-	{
-		std::map<std::string, std::string> emptys;
-		return ToLogWarnInfoAboutTermExtend(emptys);
-	}
-
-	/** upload adapter file's hash value and open param as well as dev category information, return if information has uploaded this time
-	extend from ToLogWarnInfoAboutTerm
-	*/
-	bool ToLogWarnInfoAboutTermExtend(std::map<std::string, std::string> additionalParams)
-	{
-		bool bUpload(false);
-		int fileSize = 0;
-		//calculate file hash value
-		std::map<std::string, std::string> termInfo;
-		char* strFileHash = new char[128];
-		if (ExistsFileA(m_adapterInfo.adapterFilePath)) {
-			BYTE fileHash[32];
-			SM3File(const_cast<char*>(m_adapterInfo.adapterFilePath.GetData()), fileHash);
-			ZeroMemory(strFileHash, 128);
-			SP::Module::Util::HexBuf2StrBuf(fileHash, &strFileHash, 32);
-
-#if defined(_MSC_VER)
-			HANDLE hFile;
-			hFile = CreateFile(m_adapterInfo.adapterFilePath.GetData(), 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-			if (hFile == INVALID_HANDLE_VALUE) {
-				fileSize = 0;
-			} else {
-				fileSize = GetFileSize(hFile, NULL);
-				CloseHandle(hFile);
-			}
-#else
-			//calculate file size
-			struct stat statbuf;
-			ZeroMemory(&statbuf, sizeof(statbuf));
-			stat(m_adapterInfo.adapterFilePath.GetData(), &statbuf);
-			fileSize = statbuf.st_size;
-#endif //_MSC_VER
-
-		} else {
-			memset(strFileHash, '\0', sizeof(char) * 128);
-		}
-
-		//necessary elements about adapter
-		CSimpleStringA csPortNum(true), csCheckData(true), csKeySN(true), csInOutDir(true);
-		termInfo["VendorDllName"] = m_adapterInfo.adapterFilePath.GetData();
-		termInfo["VendorDllFileHash"] = strFileHash;
-		ZeroMemory(strFileHash, 128);
-		termInfo["VendorDllFileSize"] = _itoa(fileSize, strFileHash, 10);
-		termInfo["szModel"] = m_adapterInfo.devCatInfo.szModel;
-		termInfo["szType"] = m_adapterInfo.devCatInfo.szType;
-		termInfo["Port"] = m_adapterInfo.strPort.GetData();
-		termInfo["Baudrate"] = m_adapterInfo.strBaudrate.GetData();
-
-		if (strFileHash != nullptr) {
-			delete[] strFileHash;
-			strFileHash = nullptr;
-		}
-
-		CSimpleStringA entityName(this->GetEntityBase()->GetEntityName());
-		if (!entityName.Compare("Gpio")) {
-			termInfo["PortNum"] = m_adapterInfo.strPortNum.GetData();
-		}
-		else if (!entityName.Compare("PinPad")) {
-			termInfo["CheckData"] = m_adapterInfo.strCheckdata.GetData();
-			termInfo["Keysn"] = m_adapterInfo.strKeysn.GetData();
-		}
-
-		if (!additionalParams.empty()) {
-			for (auto it = additionalParams.cbegin(); it != additionalParams.cend(); ++it) {
-				termInfo[it->first.c_str()] = it->second;
-			}
-		}
-
-		std::pair<bool, std::string> strResult;
-		strResult = generateJsonStr(termInfo);
-
-		CSmartPointer<IConfigInfo> spConfigRun;
-		CSimpleStringA csWarnMsg;
-		this->GetEntityBase()->GetFunction()->OpenConfig(Config_Run, spConfigRun);
-		spConfigRun->ReadConfigValue("Run", "WarnMsg", csWarnMsg);
-		SYSTEMTIME localTime;
-		GetLocalTime(&localTime);
-		if (csWarnMsg.IsNullOrEmpty() || csWarnMsg.Compare(strResult.second.c_str()) != 0) {
-			spConfigRun->WriteConfigValueInt("Run", "WarnDay", localTime.wDay);
-			spConfigRun->WriteConfigValue("Run", "WarnMsg", strResult.second.c_str());
-			if (!entityName.IsNullOrEmpty()) {
-				LogWarn(Severity_Low, Error_Unexpect, m_WarnCodeMap[entityName.GetData()], strResult.second.c_str());
-				bUpload = true;
-			} else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Entity Name is empty, please check!!!");
-			}
-		} else {
-			int wDay = 99;
-			spConfigRun->ReadConfigValueInt("Run", "WarnDay", wDay);
-			if (wDay != localTime.wDay) {
-				spConfigRun->WriteConfigValueInt("Run", "WarnDay", localTime.wDay);
-				if (!entityName.IsNullOrEmpty()) {
-					LogWarn(Severity_Low, Error_Unexpect, m_WarnCodeMap[entityName.GetData()], strResult.second.c_str());
-					bUpload = true;
-				} else {
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Entity Name is empty, please check!!!");
-				}
-			}
-		}
-		return bUpload;
-	}
-
 	void ResetRepeatErrTimes()
 	{
 		m_contiErrTimes = 0;

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -135,7 +135,6 @@ unsigned int CCardIssuerFSM::s1_on_event(FSMEvent* event)
 void CCardIssuerFSM::s2_on_entry()
 {
 	LOG_FUNCTION();
-	ToLogWarnInfoAboutTerm();
 	m_currentFSMState = 2;
 	SetDevState(DEVICE_STATUS_NORMAL);
 	

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -86,8 +86,6 @@ void CContactlessCardFSM::s2_on_entry()
 	SetDevState(DEVICE_STATUS_NORMAL);
 	m_resetTimes = 0;
 	m_testResult = Error_Succeed;
-
-	ToLogWarnInfoAboutTermCustom();
 }
 void CContactlessCardFSM::s2_on_exit()
 {
@@ -1425,14 +1423,6 @@ int CContactlessCardFSM::QueryCardInfo(SpReqAnsContext<ContactlessCardService_Qu
 	return ret;
 }
 
-void CContactlessCardFSM::ToLogWarnInfoAboutTermCustom()
-{
-	LOG_FUNCTION();
-
-	ToLogWarnInfoAboutTerm();
-
-}
-
 bool CContactlessCardFSM::LoadCMBPrint(CSimpleStringA csBinPath)
 {
 	if (cmdDecodeEx == NULL) {

Module/mod_ContactlessCard/ContactlessFSM.h

@@ -282,7 +282,6 @@ public:
 	bool GetWaitFlag(){return m_bWaitingAccept;}
 	void SetWaitMore(){m_bWaitAccepteMore = true;}
 	void SetExitFlag(bool bFlag=true){m_bExit = bFlag;}
-	void ToLogWarnInfoAboutTermCustom();
 	bool LoadCMBPrint(CSimpleStringA csBinPath);
 	void GetCardProcessLastErr(ErrorCodeEnum& eErrCode, CSimpleStringA& lastApiName, CSimpleStringA& alarmMsg, CSimpleStringA& csErrMsgWithReturnCode);
 

Module/mod_FingerPrint/FingerPrintFSM.cpp

@@ -30,8 +30,6 @@ void CFingerPrintFSM::s0_on_entry()
 {
 	LOG_FUNCTION();
 	SetDevState(DEVICE_STATUS_NORMAL);
-	ToLogWarnInfoAboutTerm();
-
 }
 
 void CFingerPrintFSM::s0_on_exit()

Module/mod_HSPScanner/HSPScannerFSM.cpp

@@ -210,7 +210,7 @@ ErrorCodeEnum CHSPScannerFSM::OnInit()
 {
 	LOG_FUNCTION();
 	ErrorCodeEnum erroCode = Error_Succeed;
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Source Code complied at: %s %s", __DATE__, __TIME__);
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Source Code complied at: %s %s", __DATE__, __TIME__);
 	CSystemStaticInfo sysInfo;
 	GetEntityBase()->GetFunction()->GetSystemStaticInfo(sysInfo);
 	m_csMachineType = sysInfo.strMachineType;
@@ -236,7 +236,6 @@ ErrorCodeEnum CHSPScannerFSM::OnInit()
 	if (erroCode == Error_Succeed) {
 		if (Error_Succeed == (erroCode = TryToOpenDevice())) {
 			SetDevState(DEVICE_STATUS_NORMAL);
-			ToLogWarnInfoAboutTerm();
 			return erroCode;
 		}
 	}

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -154,10 +154,6 @@ struct ImgChekTask : ITaskSp
 void CIDCertFSM::s0_on_entry()
 {
 	LOG_FUNCTION();
-	if (!m_logBefore) {
-		ToLogWarnInfoAboutTerm();
-		m_logBefore = true;
-	}
 	SetDevState(DEVICE_STATUS_NORMAL);
 }
 void CIDCertFSM::s0_on_exit()

Module/mod_IDCertificate/IDCertFSM.h

@@ -206,7 +206,7 @@ public:
 	END_FSM_RULE()
 
 		CIDCertFSM() :m_bCancelRead(false), m_bReading(false), m_bWaitReadMore(false),
-		m_bExit(false), m_testResult(Error_Succeed), m_getDevCategory(Error_Unexpect), m_csMachineType(""), m_terminalNo(""), invalidBreak(false), m_logBefore(false), transImgMsg("")
+		m_bExit(false), m_testResult(Error_Succeed), m_getDevCategory(Error_Unexpect), m_csMachineType(""), m_terminalNo(""), invalidBreak(false), transImgMsg("")
 	{
 		ZeroMemory(&m_adapterInfo, sizeof(m_adapterInfo));
 		HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x201);
@@ -294,8 +294,7 @@ private:
 	
 
 	BOOL closeImgCheck;
-	bool invalidBreak;
-	bool m_logBefore;
+	bool invalidBreak; //TODO: 只有赋值，没有调用，考虑移除  [Gifur@2025228]
 	ULLINT m_ullBeginTime, m_ullEndTime;
 };
 

Module/mod_cardissuerstore/CardIssuerFSM.cpp

@@ -135,8 +135,6 @@ unsigned int CCardIssuerFSM::s1_on_event(FSMEvent* event)
 void CCardIssuerFSM::s2_on_entry()
 {
 	LOG_FUNCTION();
-
-	ToLogWarnInfoAboutTerm();
 	m_currentFSMState = 2;
 	SetDevState(DEVICE_STATUS_NORMAL);
 	

Module/mod_gpio/GpioFSM.cpp

@@ -313,7 +313,6 @@ ErrorCodeEnum CGPIOFSM::OnInit()
 			ullEnd = SP::Module::Comm::RVCGetTickCount();
 			if (err == Error_Succeed) {
 				m_adapterInfo.FulfillCategoryInfo(devCatInfo);
-				ToLogWarnInfoAboutTerm();
 #if defined(RVC_OS_LINUX)
 				CSimpleStringA strType(devCatInfo.szType);
 				if (strType.IndexOf("FUNCVER=2.0") != -1) {

Module/mod_pinpad/PinPadFSM.cpp

@@ -22,26 +22,6 @@ const int MAX_PINPAD_INPUT_TIMEOUT = 60000;
 const int MAX_INPUT_TIMER_TIMEOUT = 600000;
 const int CurrentPasswordLen = 6;//according to guodan, we only use 6
 
-void CPinPadFSM::ToLogWarnInfoAboutTermCustom()
-{
-	LOG_FUNCTION();
-	std::map<std::string, std::string> termInfo;
-	char* strFileHash = new char[128];
-	memset(strFileHash, 0, 128);
-	termInfo["keyType"] = _itoa(m_encryptkey, strFileHash,10);
-	if (strFileHash != nullptr) {
-		delete[] strFileHash;
-		strFileHash = nullptr;
-	}
-
-	if (m_bSMLoaded)
-		termInfo["SMKeyLoad"] = "true";
-	else
-		termInfo["SMKeyLoad"] = "false";
-	
-	ToLogWarnInfoAboutTermExtend(termInfo);
-}
-
 ErrorCodeEnum CPinPadFSM::OnInit()
 {
 	m_bOpening = true;

Module/mod_pinpad/PinPadFSM.h

@@ -273,7 +273,6 @@ public:
 	}
 
 	void SelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactionContext> pTransactionContext);
-	void ToLogWarnInfoAboutTermCustom();
 	bool IsInGetInputJS() { return m_bPinInputJS; }
 public:
 	SP::Toolkit::CConditionVarPlus m_hInputConVar;