Z991239-5556 #comment 去掉ControlTerminalLife和ControlEntityLife接口

Module/mod_healthmanager/mod_healthmanager.cpp

@@ -111,23 +111,6 @@ private:
 	bool m_bDeleteSelf;
 };
 
-static void PrintTerminalRegistInfo(const TerminalRegistRet* info)
-{
-    Dbg("TerminalNo: %s", info->TerminalNo);
-    Dbg("DeviceNo: %s", info->DeviceNo);
-    Dbg("OutletNo: %s", info->OutletNo);
-    Dbg("Initializer: %s", info->Initializer);
-    Dbg("PadDeviceID: %s", info->PadDeviceID);
-    Dbg("MachineType: %s", info->MachineType);
-    Dbg("MachineVersion: %s", info->MachineVersion);
-    Dbg("Sites: %s", info->Sites);
-    Dbg("EnrolAddr: %s", info->EnrolAddr);
-    Dbg("Editor: %s", info->Editor);
-    Dbg("State: %c", info->State);
-    Dbg("PublicKey: %s", info->PublicKey);
-    Dbg("FingerPrint: %s", info->FingerPrint);
-}
-
 void HealthManagerSession::Handle_EnterState(SpReqAnsContext<HealthManagerService_EnterState_Req, HealthManagerService_EnterState_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
@@ -169,19 +152,6 @@ void HealthManagerSession::Handle_GetAuthErrMsg(SpReqAnsContext<HealthManagerSer
 	DbgToBeidou(ctx->link, __FUNCTION__)();
 	m_pEntity->GetAuthErrMsg(ctx);
 }
-void HealthManagerSession::Handle_ControlTerminalLife(
-	SpReqAnsContext<HealthManagerService_ControlTerminalLife_Req, HealthManagerService_ControlTerminalLife_Ans>::Pointer ctx)
-{
-    LOG_FUNCTION();
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->ControlTerminalLife(ctx);
-}
-void HealthManagerSession::Handle_ControlEntityLife(SpReqAnsContext<HealthManagerService_ControlEntityLife_Req, HealthManagerService_ControlEntityLife_Ans>::Pointer ctx)
-{
-    LOG_FUNCTION();
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-    m_pEntity->ControlEntityLife(ctx);
-}
 void HealthManagerSession::Handle_RealCheck(SpReqAnsContext<HealthManagerService_RealCheck_Req, HealthManagerService_RealCheck_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
@@ -1025,41 +995,6 @@ void CHealthManagerEntity::ReadCenterConfigStr(SpReqAnsContext<HealthManagerServ
 	}
 }
 
-void CHealthManagerEntity::ControlTerminalLife(
-	SpReqAnsContext<HealthManagerService_ControlTerminalLife_Req, HealthManagerService_ControlTerminalLife_Ans>::Pointer ctx)
-{
-    //< !--1:restart app; 2: shutdown app; 3:shutdown app and guardian; 4: restart pc; 5: poweroff; -- >
-	int retCode = 0;
-	ErrorCodeEnum result = Error_Unexpect;
-	switch (ctx->Req.cmdType) {
-	case 1:
-		retCode = m_fsm.QuitFrameworkAndSaveInfo(RebootTrigger_ManualLocal, RebootWay_Framework);
-		result = Error_Succeed;
-		break;
-	case 2:
-		retCode = m_fsm.QuitFrameworkAndSaveInfo(RebootTrigger_Unknown, RebootWay_Framework);
-		result = Error_Succeed;
-		break;
-	case 3:
-		retCode = m_fsm.QuitFrameworkAndSaveInfo(RebootTrigger_DeadForever, RebootWay_Framework);
-		result = Error_Succeed;
-		break;
-	case 4:
-		retCode = m_fsm.QuitFrameworkAndSaveInfo(RebootTrigger_ManualLocal, RebootWay_OS);
-		result = Error_Succeed;
-		break;
-	case 5:
-		retCode = m_fsm.QuitFrameworkAndSaveInfo(RebootTrigger_DeadForever, RebootWay_OS);
-		result = Error_Succeed;
-		break;
-	default:
-		result = Error_Param;
-		break;
-	}
-	ctx->Ans.retCode = retCode;
-    ctx->Answer(result);
-}
-
 CSimpleStringA CHealthManagerEntity::__ReadCenterConfigStr(CSimpleStringA key, CSimpleStringA entityName = "")
 {
 	CSimpleStringA str = "";

Module/mod_healthmanager/mod_healthmanager.h

@@ -76,8 +76,6 @@ public:
 	virtual void Handle_QueryHardwareInfo(SpReqAnsContext<HealthManagerService_QueryHardwareInfo_Req, HealthManagerService_QueryHardwareInfo_Ans>::Pointer ctx);
 	virtual void Handle_ReadCenterConfigStr(SpReqAnsContext<HealthManagerService_ReadCenterConfigStr_Req, HealthManagerService_ReadCenterConfigStr_Ans>::Pointer ctx);
 	virtual void Handle_GetAuthErrMsg(SpReqAnsContext<HealthManagerService_GetAuthErrMsg_Req, HealthManagerService_GetAuthErrMsg_Ans>::Pointer ctx);
-	virtual void Handle_ControlTerminalLife(SpReqAnsContext<HealthManagerService_ControlTerminalLife_Req, HealthManagerService_ControlTerminalLife_Ans>::Pointer ctx);
-	virtual void Handle_ControlEntityLife(SpReqAnsContext<HealthManagerService_ControlEntityLife_Req, HealthManagerService_ControlEntityLife_Ans>::Pointer ctx);
 private:
 	CHealthManagerEntity *m_pEntity;
 };
@@ -236,8 +234,6 @@ public:
 	void GetAuthErrMsg(SpReqAnsContext<HealthManagerService_GetAuthErrMsg_Req, HealthManagerService_GetAuthErrMsg_Ans>::Pointer ctx);
 	bool StartManagerDesktopPage(CSimpleStringA pageName);
 	void WarnAndRestartFramwork();
-	void ControlTerminalLife(SpReqAnsContext<HealthManagerService_ControlTerminalLife_Req, HealthManagerService_ControlTerminalLife_Ans>::Pointer ctx);
-	void ControlEntityLife(SpReqAnsContext<HealthManagerService_ControlEntityLife_Req, HealthManagerService_ControlEntityLife_Ans>::Pointer ctx);
 	void RealCheck(SpReqAnsContext<HealthManagerService_RealCheck_Req, HealthManagerService_RealCheck_Ans>::Pointer ctx);
 	void OnAnswer(CSmartPointer<IAsynWaitSp> pAsynWaitSp);
 	ErrorCodeEnum ExceptionErrorProcess(const char* pszEntityName, ErrorCodeEnum eTestResult);