#IQRV #comment [Module] 修改guiconsole和集中配置的部分打印输出

Module/mod_CenterSetting/CenterSettingConn.cpp

@@ -130,6 +130,7 @@ ErrorCodeEnum CCenterSettingConn::BeginPollConfig()
 	else
 	{
 		PollSMR req = {};
+
 #ifdef RVC_OS_WIN
 		strncpy_s(req.TerminalNo, sizeof(req.TerminalNo), info.strTerminalID, _TRUNCATE);
 		strncpy_s(req.MachineType, sizeof(req.MachineType), info.strMachineType, _TRUNCATE);
@@ -144,6 +145,7 @@ ErrorCodeEnum CCenterSettingConn::BeginPollConfig()
 	}
 
 	SendPackage(pPackage);
+
 	return Error_Succeed;
 }
 
@@ -238,9 +240,7 @@ ErrorCodeEnum CCenterSettingConn::OnEndPollConfig(const CSmartPointer<IPackage>
 
 		if (!IsServiceAvailable(tmp))
 		{
-			//delete[] pBuf;
-			Dbg("集中配置服务新地址[%s]无法连接!!!", tmp);
-			//return Error_Unexpect;
+			Dbg("the new centersetting server ip[%s] cannot be connectable!!!", tmp);
 		}
 
 		// 读出当前集中配置服务地址
@@ -300,7 +300,7 @@ ErrorCodeEnum CCenterSettingConn::OnEndPollConfig(const CSmartPointer<IPackage>
 
 	if (nIndex > 1)
 	{
-		LogEvent(Severity_Middle, EVENT_MOD_CENTERSETTING_DOWNOK, "集中配置同步成功");
+		LogEvent(Severity_Middle, EVENT_MOD_CENTERSETTING_DOWNOK, "Sync centersetting config files succc.");
 
 		// 检查RvcWebVersion是否有变化
 		CSimpleStringA strFilePath;
@@ -313,7 +313,7 @@ ErrorCodeEnum CCenterSettingConn::OnEndPollConfig(const CSmartPointer<IPackage>
 		{
 			Dbg("rvc web version changed, last: [%s], current: [%s]", (const char*)pEntity->m_strRvcWebVersion, szVersion);
 			pEntity->m_strRvcWebVersion = szVersion;
-			LogEvent(Severity_Middle, EVENT_MOD_CENTERSETTING_RVCWEBVER_CHANGE, "RvcWeb版本变更");
+			LogEvent(Severity_Middle, EVENT_MOD_CENTERSETTING_RVCWEBVER_CHANGE, "RvcWeb version has updated !");
 		}
 	}
 

Module/mod_guiconsole/mod_guiconsole.cpp

@@ -14,7 +14,7 @@ void CGUIConsoleEntity::OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPoin
 	m_FSM.Init(this);
 	auto  rc = SubscribeEntitysEvents();
 	if (rc != Error_Succeed)
-		Dbg("subscribe MaintainWatcher event fail, 0x%x", rc);
+		Dbg("subscribe MaintainWatcher event fail, %s",  SpStrError(rc));
 	else
 		Dbg("subscribe MaintainWatcher event succeed");
 		
@@ -23,7 +23,6 @@ void CGUIConsoleEntity::OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPoin
 
 void CGUIConsoleEntity::OnPreClose(EntityCloseCauseEnum eCloseCause,CSmartPointer<ITransactionContext> pTransactionContext) 
 { 
-	//m_task.Close();
 	m_FSM.PostExitEvent();
 	UnsubscribeEntitysEvents();
 	pTransactionContext->SendAnswer(Error_Succeed); 
@@ -38,21 +37,21 @@ void CGUIConsoleEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogI
 	const DWORD dwSysError,const DWORD dwUserCode,const DWORD dwEntityInstanceID, const WORD wEntityDevelID, 
 	const CAutoArray<DWORD> &Param, const char *pszEntityName, const char *pszModuleName,const char *pszMessage)
 	{
-		//Dbg("OnLog(entity = %s, syscode = 0x%X, usercode = 0x%X", pszEntityName, dwSysError, dwUserCode);
+		Dbg("OnLog(entity = %s, syscode = 0x%X, usercode = 0x%X", pszEntityName, dwSysError, dwUserCode);
 
 		if (dwUserCode == EVENT_MACHINE_COVER_OPEN)		// 机盖打开
 		{
-			Dbg("机盖打开");
+			Dbg("the machine cover open!!");
 			m_FSM.PostEventFIFO(new FSMEvent(CGUIConsoleFSM::Event_CoverOpen));
 		}
 		else if (dwUserCode == EVENT_MACHINE_COVER_CLOSE)	// 机盖关闭
 		{
-			Dbg("机盖关闭");
+			Dbg("the machine cover close.");
 			m_FSM.PostEventFIFO(new FSMEvent(CGUIConsoleFSM::Event_CoverClose));
 		}
 		else if (dwUserCode == EVENT_UKEY_INSERTED)		// 证书插入
 		{			
-			Dbg("证书插入");
+			Dbg("the key inserted");
 			m_FSM.PostEventFIFO(new FSMEvent(CGUIConsoleFSM::Event_UKeyInserted));
 		}
 		else if ((dwUserCode == EVENT_UKEY_LOW_LEVEL)		// 具有维护权
@@ -61,9 +60,9 @@ void CGUIConsoleEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogI
 			bool bLowLevel = dwUserCode == EVENT_UKEY_LOW_LEVEL;
 			
 			if (bLowLevel)
-				Dbg("低级维护权限");
+				Dbg("lower priviledge");
 			else
-				Dbg("高级维护权限");
+				Dbg("higher priviledge");
 
 			// 调用UKey接口取维护人员信息
 			m_strUserID = "";
@@ -76,6 +75,7 @@ void CGUIConsoleEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogI
 			if (rc != Error_Succeed)
 			{
 				Dbg("connect to MaintainWatcher entity fail: %d", rc);
+				pClient->SafeDelete();
 			}
 			else
 			{
@@ -84,7 +84,7 @@ void CGUIConsoleEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogI
 				rc = pClient->GetUserInfo(req, ans, 10000);
 				if (rc != Error_Succeed)
 				{
-					Dbg("get userinfo fail from MaintainWatcher: %d", rc);
+					Dbg("get userinfo fail from MaintainWatcher: %s", SpStrError(rc));
 				}
 				else
 				{
@@ -109,10 +109,11 @@ void CGUIConsoleEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogI
 							m_strAuthTime = arr2[1];
 					}
 				}
+				
+                pClient->GetFunction()->CloseSession();
 
-				pClient->SafeDelete();
-				pClient = NULL;
 			}
+            pClient = NULL;
 
 			m_strCurRight = bLowLevel ? "Low" : "High";
 			m_dwBeginTime = CSmallDateTime::GetNow();
@@ -130,13 +131,13 @@ void CGUIConsoleEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogI
 			m_strCurRight = "";
 			m_dwBeginTime = 0;
 
-			Dbg("证书拨出");
+			Dbg("certificate key pull out");
 			m_FSM.PostEventFIFO(new FSMEvent(CGUIConsoleFSM::Event_UKeyPulled));
 		}
 		else if (dwUserCode == LOG_EVT_HEALTH_FIRST_ENTER_MAINPADE)
 		{
 			// IE首页打开， 关闭运行输出
-			Dbg("IE首页加载成功，关闭输出控制台");
+			Dbg("IE main page has been loaded successfully, close console terminal!");
 			GetFunction()->GetPrivilegeFunction()->CloseOuputConsole();
 		}
 	}
@@ -271,7 +272,7 @@ ErrorCodeEnum CGUIConsoleEntity::AddMaterialCounter(const char *pszMaterialCode)
 	}
 	else
 	{
-		Dbg("连接物料服务失败");
+		Dbg("Connect to MaterialMgrEntity failed!");
 		rc = Error_NetBroken;
 	}
 
@@ -280,7 +281,7 @@ ErrorCodeEnum CGUIConsoleEntity::AddMaterialCounter(const char *pszMaterialCode)
 
 	if (rc == Error_Succeed)
 	{
-		Dbg("递增物料{%s}计数成功", pszMaterialCode);		
+		Dbg("Add material counter for %s succ.", pszMaterialCode);		
 	}
 	else
 	{
@@ -313,7 +314,7 @@ ErrorCodeEnum CGUIConsoleEntity::QueryMaterialInfo(const char *pszDeviceNo, unsi
 	}
 	else
 	{
-		Dbg("连接物料服务失败");
+		Dbg("Connect to MaterialMgr failed!");
 		rc = Error_NetBroken;
 	}
 
@@ -340,7 +341,7 @@ ErrorCodeEnum CGUIConsoleEntity::GetMaterialCounter(const char *pszMaterial, uns
 	}
 	else
 	{
-		Dbg("连接物料服务失败");
+		Dbg("Connect to MaterialMgrEntity failed!");
 		rc = Error_NetBroken;
 	}
 
@@ -533,6 +534,9 @@ ErrorCodeEnum CGUIConsoleEntity::SyncMaterialCount(const char *pszDeviceNo, DWOR
 			arrCardBoxNo, arrPsbCode, arrPsbName, arrCardInit, arrCardRemains, arrCardIssued, arrCardMixed, arrCardPercent);
 		pCnn->Close();
 	}
+	else {
+		rc = Error_NetBroken;
+	}
 
 	pCnn->DecRefCount();
 	pCnn = NULL;