Z991239-5255 #comment 去掉msg：TradeManage、TerminalManager

Module/mod_healthmanager/HealthManager_msg_g.h

@@ -9,41 +9,10 @@
 #include "SpHelper.h"
 
 namespace HealthManager {
-#define eMsg_TradeManage 0
-#define eMsg_TerminalManager 1
-#define eMsg_AuthStatus 2
+#define eMsg_AuthStatus 0
 
-#define eMsgSig_TradeManage 1347045541
-#define eMsgSig_TerminalManager 1453185458
 #define eMsgSig_AuthStatus -1654977732
 
-struct TradeManage
-{
-	int op;
-	CSimpleStringA time;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & op & time;
-	}
-
-};
-
-///////////////////////////
-
-struct TerminalManager
-{
-	int op;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & op;
-	}
-
-};
-
-///////////////////////////
-
 struct AuthStatus
 {
 	int result;

Module/mod_healthmanager/Healthmanager.xml

@@ -196,13 +196,6 @@
       </res>
     </twoway>
 	</class>
-	<message name="TradeManage">
-			<param name="op" type="int"/>
-			<param name="time" type="string" />
-	</message>
-	<message name="TerminalManager">
-			<param name="op" type="int"/>
-	</message>
 	<message name="AuthStatus">
 			<param name="result" type="int"/>
 			<param name="msg" type="string" />

Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -567,7 +567,7 @@ string CHeartBeatFSM::HandShakeJsonStr() {
 	//写入shakeHandErrorVO对象
 	HandErrListReq errListReq;
 	errListReq.warnLevel = GetWarnLevel();
-	errListReq.reserved1 = GetTradeManagerState();
+	errListReq.reserved1 = ' ';
 	ZeroMemory(errListReq.errList, 512);
 
 	obj3["warnLevel"] = errListReq.warnLevel;
@@ -1050,7 +1050,7 @@ void HeartBeatConnection::SendHandShake()
 
 	HandErrListReq errListReq;
 	errListReq.warnLevel = m_pFSM->GetWarnLevel();
-	errListReq.reserved1 = m_pFSM->GetTradeManagerState();
+	errListReq.reserved1 = ' ';
 	ZeroMemory(errListReq.errList, 512);
 
 	pkt->AddStruct("ENTSTAT", false, false, (LPBYTE)&errListReq, sizeof(HandErrListReq));

Module/mod_heartbeat/HeartBeatFSM.h

@@ -304,7 +304,7 @@ public:
 
 	CHeartBeatFSM():m_initTimes(0),m_bUseBackup(false),m_testResult(Error_Succeed),
 	m_warnLevel(0), m_entErrorList(""), m_nLodCtrFlag(0), m_pHandShakeConn(NULL)
-	, m_tradeState(99),m_bJBMachine(false), m_pCRAClient(NULL)
+	,m_bJBMachine(false), m_pCRAClient(NULL)
 	, m_localDeviceNo(""), m_ILDeviceNo(""), m_tmpMultiBlob(""), m_terminalStage(""), m_strHandShakeUrl(""),m_bAlarmed(false)
 	,m_longConnInterval(20000),m_handShakeConnInterval(20000){}
 	~CHeartBeatFSM(){}
@@ -343,10 +343,9 @@ public:
 	ErrorCodeEnum SetErrorList(int warmLevel,CSimpleStringA strList);
 	void SelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactionContext> pTransactionContext);
 	int GetWarnLevel(){return m_warnLevel;}
-	void SetTradeManagerState(int tState){ m_tradeState = tState; }
 	void SetTerminalStageState(CSimpleStringA stage) { m_terminalStage = stage; }
 	CSimpleStringA GetTerminalStageState() { return m_terminalStage; }
-	int GetTradeManagerState(){ return m_tradeState; }
+
 	// Terminal Performance Counter component [Josephus in 9:17:13 2016/4/23]
 	ErrorCodeEnum GetPerformCounter(TermianlCounter& counter);
 	const CSimpleStringA GetRealIP()
@@ -380,7 +379,7 @@ private:
 	int m_handShakeConnInterval;//新心跳时间间隔
 	SOCKET m_ConnSocket;
 	CSimpleStringA m_servStr,m_servIP,m_servStrB,m_servIPB,m_entErrorList,m_localDeviceNo,m_ILDeviceNo,m_tmpMultiBlob, m_terminalStage;
-	int m_port,m_portB,m_initTimes,m_warnLevel,m_tradeState;
+	int m_port,m_portB,m_initTimes,m_warnLevel;
 	unsigned long m_ulServIP;
 	HeartBeatConnection* m_pHandShakeConn;
 	bool m_bUseBackup;

Module/mod_heartbeat/mod_heartbeat.cpp

@@ -19,37 +19,6 @@ void HeartBeatServerSession::Handle_CardActive(SpReqAnsContext<HeartBeatService_
 void CHeartBeatEntity::OnSysVarEvent(const char *pszKey,
 	const char *pszValue, const char *pszOldValue, const char *pszEntityName)
 {
-	if ((_strnicmp(pszKey, "TradeManageState", strlen("TradeManageState")) == 0))
-	{
-		if (_strnicmp(pszValue, "L", strlen("L")) == 0)
-		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("To set trade manager state to 8.");
-			m_fsm.SetTradeManagerState(8);
-		}
-		else
-		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("To set trade manager state to 1.");
-			m_fsm.SetTradeManagerState(1);
-		}
-	}
-	if ((_strnicmp(pszKey, "TerminalManagerState", strlen("TerminalManagerState")) == 0))
-	{
-		if (_strnicmp(pszValue, "L", strlen("L")) == 0)
-		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("To set terminal manager state to 7.");
-			m_fsm.SetTradeManagerState(7);
-		}
-		else if (_strnicmp(pszValue, "N", strlen("N")) == 0)
-		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("To set terminal manager state to 1.");
-			m_fsm.SetTradeManagerState(1);
-		}
-		else if (_strnicmp(pszValue, "K", strlen("K")) == 0)
-		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("To set terminal manager state to 6.");
-			m_fsm.SetTradeManagerState(6);
-		}
-	}
 	if ((_strnicmp(pszKey, "TerminalStage", strlen("TerminalStage")) == 0))
 	{
 		if (_strnicmp(pszValue, "A", strlen("A")) == 0)
@@ -61,19 +30,6 @@ void CHeartBeatEntity::OnSysVarEvent(const char *pszKey,
 }
 void CHeartBeatEntity::OnBroadcastEvent(CUUID SubID, const char *pszEntityName, DWORD dwMessageId, DWORD dwMessageSignature, CAutoBuffer Buffer)
 {
-	if (_strnicmp(pszEntityName, "HealthManager", strlen("HealthManager")) == 0)
-	{
-		if (dwMessageSignature == eMsgSig_TerminalManager)
-		{
-			HealthManager::TerminalManager tm;
-			SpBuffer2Object(Buffer, tm);
-			if (tm.op == 99)
-			{
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Receive healthmanager event 99,to set terminal manager state to 1.");
-				m_fsm.SetTradeManagerState(1);
-			}
-		}
-	}
 }
 void CHeartBeatEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID, const LogTypeEnum eLogType, const SeverityLevelEnum eLevel,
 	const DWORD dwSysError, const DWORD dwUserCode, const DWORD dwEntityInstanceID, const WORD wEntityDevelID,

Module/mod_heartbeat/mod_heartbeat.h

@@ -30,8 +30,6 @@ public:
 	{
 		LOG_FUNCTION();
 		ErrorCodeEnum rt = m_fsm.Init(this);
-		GetFunction()->RegistSysVarEvent("TradeManageState", this);
-		GetFunction()->RegistSysVarEvent("TerminalManagerState", this);
 		GetFunction()->RegistSysVarEvent("TerminalStage", this);
 		CUUID uuidCardSwiper;
 		GetFunction()->SubscribeBroadcast("CardSwiper", "", this, uuidCardSwiper);