#IQBX #comment 健康实体编译通过

Module/mod_healthmanager/CMakeLists.txt

@@ -5,11 +5,22 @@ set(${MODULE_PREFIX}_SRCS
 	mod_healthmanager.h
 	HealthManagerFSM.cpp
 	HealthManagerFSM.h
-	TerminalInfoQueryConn.cpp
-	TerminalInfoQueryConn.h
+
 	EntityBootStruct.h
 	)
 
+if(MSVC)
+	list(APPEND ${MODULE_PREFIX}_SRCS 
+		${ThirdPartyHeadRoot}/SystemStatus/CSystemStatus.cpp
+	)
+else()
+	#UOS need it ?
+	list(APPEND ${MODULE_PREFIX}_SRCS 
+		TerminalInfoQueryConn.cpp
+		TerminalInfoQueryConn.h
+	)
+endif(MSVC)
+
 set(MOD_VERSION_STRING "1.0.2-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
@@ -35,6 +46,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${MODULE_MICRO_SERVICES_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_JSONCPP}
+	${ThirdPartyHeadRoot}/SystemStatus
 )
 
 target_link_directories(${MODULE_NAME} PRIVATE
@@ -44,7 +56,7 @@ target_link_directories(${MODULE_NAME} PRIVATE
 # 添加实体需要依赖的其他共享库（包括系统库）
 set(${MODULE_PREFIX}_SYSLIBS libpublicFun)
 if(MSVC)
-	list(APPEND ${MODULE_PREFIX}_SYSLIBS Ws2_32)
+	list(APPEND ${MODULE_PREFIX}_SYSLIBS Ws2_32 IPHLPAPI)
 endif(MSVC)
 set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP})
 target_link_libraries(${MODULE_NAME} ${MODULE_BASE_LIBS} ${${MODULE_PREFIX}_LIBS} ${${MODULE_PREFIX}_SYSLIBS})

Module/mod_healthmanager/HealthManagerFSM.cpp

@@ -10,8 +10,6 @@
 #include <Winsock2.h>
 #include <io.h>
 #include "CSystemStatus.h"
-#pragma comment(lib, "IPHLPAPI.lib")
-#pragma comment(lib, "libpublicFun.lib")
 #else
 #include <unistd.h>
 #include <fcntl.h>

Module/mod_healthmanager/HealthManagerFSM.h

@@ -20,11 +20,9 @@ using namespace DeviceControl;
 
 #include "ResourceWatcher_client_g.h"
 using namespace ResourceWatcher;
-
-#if defined(RVC_OS_WIN)
-#include "json.h"
+#include "json/json.h"
 #include <xstring>
-#endif
+
 using namespace PinPad;
 enum HealthManger_UserErrorCode {
 	HealthManager_UserErrorCode_Start = 0x50100200,