Z991239-5241 #comment 彻底去除beatheart中对自检实体的引用

Signed-Off-By: commit-hook

Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -569,12 +569,11 @@ string CHeartBeatFSM::HandShakeJsonStr() {
 	errListReq.warnLevel = GetWarnLevel();
 	errListReq.reserved1 = GetTradeManagerState();
 	ZeroMemory(errListReq.errList, 512);
-	strncpy(errListReq.errList, GetEntityErrorList(), GetEntityErrorList().GetLength());
 
 	obj3["warnLevel"] = errListReq.warnLevel;
 	string tmp_string(1, errListReq.reserved1);
 	obj3["reserved1"] = tmp_string.c_str();
-	obj3["errList"] = CSimpleStringA::Format("%s", errListReq.errList).GetData();
+	obj3["errList"] = "";
 	root["shakeHandErrorVO"]=Json::Value(obj3); 
 
 	
@@ -1053,7 +1052,7 @@ void HeartBeatConnection::SendHandShake()
 	errListReq.warnLevel = m_pFSM->GetWarnLevel();
 	errListReq.reserved1 = m_pFSM->GetTradeManagerState();
 	ZeroMemory(errListReq.errList, 512);
-	strncpy(errListReq.errList,m_pFSM->GetEntityErrorList(),m_pFSM->GetEntityErrorList().GetLength());
+
 	pkt->AddStruct("ENTSTAT", false, false, (LPBYTE)&errListReq, sizeof(HandErrListReq));
 
 	// [Josephus in 9:38:25 2016/4/23]

Module/mod_heartbeat/HeartBeatFSM.h

@@ -347,7 +347,6 @@ public:
 	void SetTerminalStageState(CSimpleStringA stage) { m_terminalStage = stage; }
 	CSimpleStringA GetTerminalStageState() { return m_terminalStage; }
 	int GetTradeManagerState(){ return m_tradeState; }
-	CSimpleString GetEntityErrorList(){return m_entErrorList;}
 	// Terminal Performance Counter component [Josephus in 9:17:13 2016/4/23]
 	ErrorCodeEnum GetPerformCounter(TermianlCounter& counter);
 	const CSimpleStringA GetRealIP()

Module/mod_heartbeat/mod_heartbeat.cpp

@@ -15,10 +15,7 @@ void HeartBeatServerSession::Handle_CardActive(SpReqAnsContext<HeartBeatService_
 	DbgToBeidou(ctx->link, __FUNCTION__)();
 	m_pEntity->CardActive(ctx);
 }
-ErrorCodeEnum CHeartBeatEntity::GetEntityErrorList(int &warmLevel,CSimpleStringA &strList)
-{
-	return Error_Succeed;
-}
+
 void CHeartBeatEntity::OnSysVarEvent(const char *pszKey,
 	const char *pszValue, const char *pszOldValue, const char *pszEntityName)
 {

Module/mod_heartbeat/mod_heartbeat.h

@@ -68,15 +68,11 @@ public:
 		m_fsm.PostEventFIFO(pEvt);
 	}
 
-	ErrorCodeEnum GetEntityErrorList(int &warmLevel,CSimpleStringA &strList);
 	virtual void OnSysVarEvent(const char *pszKey,
 		const char *pszValue, const char *pszOldValue, const char *pszEntityName);
 	virtual void OnSelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactionContext> pTransactionContext)
 	{
 		m_fsm.SelfTest(eTestType,pTransactionContext);
-		int warnLevel;
-		CSimpleStringA strList("");
-		GetEntityErrorList(warnLevel,strList);
 	}
 
 	virtual bool IsService()const{return true;}