Bläddra i källkod

#IQBX #comment 心跳编译成功

80374374 1 år sedan
förälder
incheckning
758952a27f
2 ändrade filer med 14 tillägg och 22 borttagningar
  1. 0 8
      Module/mod_heartbeat/HeartBeatFSM.cpp
  2. 14 14
      Module/mod_heartbeat/HeartBeat_UserErrorCode.h

+ 0 - 8
Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -2,16 +2,8 @@
 #include "HeartBeatFSM.h"
 #include "HeartBeat_UserErrorCode.h"
 #include <regex>
-#ifdef RVC_OS_WIN
-#include "json.h"
-#pragma comment (lib, "Ws2_32.lib")
-#pragma comment (lib, "Mswsock.lib")
-#pragma comment (lib, "AdvApi32.lib")
-#pragma comment(lib, "pdh.lib")
-#else
 #include "json/json.h"
 #include <string.h>
-#endif //RVC_OS_WIN
 
 using namespace CardReadAdapter;
 #include "EventCode.h"

+ 14 - 14
Module/mod_heartbeat/HeartBeat_UserErrorCode.h

@@ -4,19 +4,19 @@
 
 #define HeartBeat_UserErrorCode_Start 0x50300200
 
-#define HeartBeat_UserErrorCode_SendCardActive_InParam									(HeartBeat_UserErrorCode_Start + 1)	//大机发送跨机包,SendCardActive, 必要的入参
-#define HeartBeat_UserErrorCode_PkgRcvProcCardActive_InParam							(HeartBeat_UserErrorCode_Start + 2)	//卡库心跳接收后发送给大机,必要的参数
-#define HeartBeat_UserErrorCode_Connect_CardReader_Failed								(HeartBeat_UserErrorCode_Start + 3)	//卡库心跳连接卡机功能集失败
-#define HeartBeat_UserErrorCode_Connect_CardStore_Invoke_PreOnline_Inparam				(HeartBeat_UserErrorCode_Start + 4)	//卡库心跳调用PreOnline
-#define HeartBeat_UserErrorCode_Connect_CardStore_Invoke_PreOnline_Falied				(HeartBeat_UserErrorCode_Start + 5)	//卡库心跳调用PreOnline,返回失败
-#define HeartBeat_UserErrorCode_Connect_CardStore_Invoke_QueryCardInfoOnStore_Falied	(HeartBeat_UserErrorCode_Start + 6)	//卡库心跳调用PreOnline后再调用QueryCardInfoOnStore,返回失败
-#define HeartBeat_UserErrorCode_CardIssuer_In_Fault_State								(HeartBeat_UserErrorCode_Start + 7)	//卡库卡机状态异常
-#define HeartBeat_UserErrorCode_CardStore_CardIssuer_In_Use								(HeartBeat_UserErrorCode_Start + 8)	//卡库卡机正在使用中
-#define HeartBeat_UserErrorCode_CardIssuer_Open_Failed									(HeartBeat_UserErrorCode_Start + 9)	//卡库卡机未成功打开
-#define HeartBeat_UserErrorCode_CardIssuer_ProcessCostTooLong							(HeartBeat_UserErrorCode_Start + 10)//卡库处理PreOnline耗时过久,情况比较多,难区分
-#define LOG_EVT_HEARTBEAT_TASK_START		0x50310000		//新心跳服务启动
-#define LOG_EVT_HEARTBEAT_TASK_NOT_START	0x50310001		//新心跳服务未启动
-#define LOG_EVT_HEARTBEAT_HTTP_ERROR		0x50310002		//新心跳服务连接失败
-#define LOG_EVT_HEARTBEAT_LACK_CENSETTINGS		0x50310003		//读取集中配置失败
+#define HeartBeat_UserErrorCode_SendCardActive_InParam									(HeartBeat_UserErrorCode_Start + 1)	//澶ф満鍙戦€佽法鏈哄寘锛孲endCardActive锛� 蹇呰�鐨勫叆鍙�
+#define HeartBeat_UserErrorCode_PkgRcvProcCardActive_InParam							(HeartBeat_UserErrorCode_Start + 2)	//鍗″簱蹇冭烦鎺ユ敹鍚庡彂閫佺粰澶ф満锛屽繀瑕佺殑鍙傛暟
+#define HeartBeat_UserErrorCode_Connect_CardReader_Failed								(HeartBeat_UserErrorCode_Start + 3)	//鍗″簱蹇冭烦杩炴帴鍗℃満鍔熻兘闆嗗け璐�
+#define HeartBeat_UserErrorCode_Connect_CardStore_Invoke_PreOnline_Inparam				(HeartBeat_UserErrorCode_Start + 4)	//鍗″簱蹇冭烦璋冪敤PreOnline
+#define HeartBeat_UserErrorCode_Connect_CardStore_Invoke_PreOnline_Falied				(HeartBeat_UserErrorCode_Start + 5)	//鍗″簱蹇冭烦璋冪敤PreOnline锛岃繑鍥炲け璐�
+#define HeartBeat_UserErrorCode_Connect_CardStore_Invoke_QueryCardInfoOnStore_Falied	(HeartBeat_UserErrorCode_Start + 6)	//鍗″簱蹇冭烦璋冪敤PreOnline鍚庡啀璋冪敤QueryCardInfoOnStore锛岃繑鍥炲け璐�
+#define HeartBeat_UserErrorCode_CardIssuer_In_Fault_State								(HeartBeat_UserErrorCode_Start + 7)	//鍗″簱鍗℃満鐘舵€佸紓甯�
+#define HeartBeat_UserErrorCode_CardStore_CardIssuer_In_Use								(HeartBeat_UserErrorCode_Start + 8)	//鍗″簱鍗℃満姝e湪浣跨敤涓�
+#define HeartBeat_UserErrorCode_CardIssuer_Open_Failed									(HeartBeat_UserErrorCode_Start + 9)	//鍗″簱鍗℃満鏈�垚鍔熸墦寮€
+#define HeartBeat_UserErrorCode_CardIssuer_ProcessCostTooLong							(HeartBeat_UserErrorCode_Start + 10)//鍗″簱澶勭悊PreOnline鑰楁椂杩囦箙锛屾儏鍐垫瘮杈冨�锛岄毦鍖哄垎
+#define LOG_EVT_HEARTBEAT_TASK_START		0x50310000		//鏂板績璺虫湇鍔″惎鍔�
+#define LOG_EVT_HEARTBEAT_TASK_NOT_START	0x50310001		//鏂板績璺虫湇鍔℃湭鍚�姩
+#define LOG_EVT_HEARTBEAT_HTTP_ERROR		0x50310002		//鏂板績璺虫湇鍔¤繛鎺ュけ璐�
+#define LOG_EVT_HEARTBEAT_LACK_CENSETTINGS		0x50310003		//璇诲彇闆嗕腑閰嶇疆澶辫触
 
 #endif