Z991239-4303 #comment 合并心跳实体代码，增加jsoncpp引用

Signed-Off-By: commit-hook

Module/mod_heartbeat/CMakeLists.txt

@@ -20,13 +20,16 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${MODULE_BASE_DIR}/mod_ScannerSet
 	${MODULE_BASE_DIR}/mod_selfchecker
 	${MODULE_BASE_DIR}/mod_healthmanager
+	${CONAN_INCLUDE_DIRS_JSONCPP}
 )
+target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_JSONCPP})
 
 # 添加实体需要依赖的其他共享库（包括系统库）
 if(MSVC)
 set(${MODULE_PREFIX}_LIBS  Ws2_32 Mswsock AdvApi32 pdh ${SPBASE_LIB} ${RVCCOMM_LIB})
 else()
 set(${MODULE_PREFIX}_LIBS  ${SPBASE_LIB} ${RVCCOMM_LIB})
+set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_ALL_LIBS} ${CONAN_PKG_LIBS_JSONCPP})
 endif(MSVC)
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -2,12 +2,14 @@
 #include <string.h>
 #include "HeartBeatFSM.h"
 #include "HeartBeat_UserErrorCode.h"
-
+#include <regex>
 #ifdef RVC_OS_WIN
 #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"
 #endif //RVC_OS_WIN
 using namespace CardIssuer;
 using namespace PinPad;