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

Signed-Off-By: commit-hook

Module/mod_heartbeat/HeartBeatFSM.h

@@ -14,12 +14,9 @@
 #include <pdhmsg.h>
 
 #include <Loadperf.h>
-#include "..\mod_CardReadAdapter\CardReadAdapter_client_g.h"
 #else
-//oiltestlinux
-#include "CardReadAdapter_client_g.h"
 #endif //RVC_OS_WIN
-
+#include "CardReadAdapter_client_g.h"
 //#pragma comment(lib, "Loadperf.lib")
 
 #include "SpFSM.h"

Module/mod_heartbeat/mod_heartbeat.cpp

@@ -17,56 +17,6 @@ void HeartBeatServerSession::Handle_CardActive(SpReqAnsContext<HeartBeatService_
 }
 ErrorCodeEnum CHeartBeatEntity::GetEntityErrorList(int &warmLevel,CSimpleStringA &strList)
 {
-	if (m_pSelfCheckerClient == NULL)
-	{
-		m_pSelfCheckerClient = new SelfCheckerService_ClientBase(this);
-		if (m_pSelfCheckerClient == NULL)
-		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("create(new) client failed.");
-			m_pSelfCheckerClient->SafeDelete();
-			m_pSelfCheckerClient = NULL;
-			return Error_Resource;
-		}
-	}
-	ErrorCodeEnum eErr = Error_Unexpect;
-	CSmartPointer<IAsynWaitSp> spWait;
-	if (!m_bConnetedSS)
-	{
-		ErrorCodeEnum eErrConn = Error_Unexpect;
-		eErrConn = m_pSelfCheckerClient->Connect(spWait);
-		if (eErrConn == Error_Succeed && spWait != NULL)
-			eErr = spWait->WaitAnswer(2000);
-		if (eErrConn != Error_Succeed || eErr != Error_Succeed)
-		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("connect to selfchecker failed.");
-			if(eErrConn != Error_Succeed) {
-				m_pSelfCheckerClient->SafeDelete();
-			}else{ 
-				m_pSelfCheckerClient->GetFunction()->CloseSession();
-			}
-			m_pSelfCheckerClient = NULL;
-			return Error_Unexpect;
-		}
-		m_bConnetedSS = true;
-	}
-	//SpReqAnsContext<SelfCheckerService_GetEntityErrorList_Req, SelfCheckerService_GetEntityErrorList_Ans>::Pointer ctx;
-	SelfCheckerService_GetEntityErrorList_Req req;
-	SelfCheckerService_GetEntityErrorList_Ans ans;
-
-	eErr = (*m_pSelfCheckerClient)(EntityResource::getLink().upgradeLink())->GetEntityErrorList(req,ans,5000);
-	if (eErr != Error_Succeed)
-	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetEntityErrorList failed.%d",eErr);
-		m_bConnetedSS = false;
-#ifdef RVC_OS_WIN
-		m_pSelfCheckerClient->SafeDelete();
-#else
-		m_pSelfCheckerClient->GetFunction()->CloseSession();
-#endif
-		m_pSelfCheckerClient = NULL;
-		return eErr;
-	}
-	m_fsm.SetErrorList(ans.warmLevel,ans.list);
 	return Error_Succeed;
 }
 void CHeartBeatEntity::OnSysVarEvent(const char *pszKey,

Module/mod_heartbeat/mod_heartbeat.h

@@ -6,17 +6,9 @@
 #include "HeartBeatFSM.h"
 #include "HeartBeat_server_g.h"
 using namespace HeartBeat;
-#ifdef RVC_OS_WIN
-#include "../mod_selfchecker/SelfChecker_client_g.h"
-using namespace SelfChecker;
-#include "../mod_healthmanager/HealthManager_msg_g.h"
-using namespace HealthManager;
-#else
-#include "SelfChecker_client_g.h"
-using namespace SelfChecker;
 #include "HealthManager_msg_g.h"
 using namespace HealthManager;
-#endif
+
 
 class HeartBeatServerSession : public HeartBeatService_ServerSessionBase
 {
@@ -31,7 +23,7 @@ private:
 class CHeartBeatEntity : public CEntityBase, public ISysVarListener, public IBroadcastListener
 {
 public:
-	CHeartBeatEntity():m_bConnetedSS(false),m_pSelfCheckerClient(NULL){}
+	CHeartBeatEntity():m_bConnetedSS(false){}
 	virtual ~CHeartBeatEntity(){}
 	virtual const char *GetEntityName() const { return "HeartBeat"; }
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITransactionContext> pTransactionContext) 
@@ -96,7 +88,6 @@ public:
 
 private:
 	CHeartBeatFSM m_fsm;
-	SelfCheckerService_ClientBase *m_pSelfCheckerClient;
 	bool m_bConnetedSS;
 };
 #endif //__MOD_HEARTBEAT_H